Open Stack

On 18/11/16 15:27, Darragh Bailey - mailing lists wrote:
> 
<snipped>

> At this point, now you'll see X, X' & X'', and Y, Y' & Y''. Obviously
> this cause a bit of confusion when listing the changes using:
> 
>  git log --oneline --graph E~1..local/mitaka
> 
> you see something like the following (see [1] for how I created this):
> 
> *   899cb6e [O] Merging Y2 into N
> |\
> | * 3c08f48 [Y] Adding tmp7wtzvo69  <--- really Y''
> | * db8d2c3 [X] Adding tmpnxot0u9s
> | * 97cc90c [I] Adding tmps2xhxp2f
> * |   9ea35c3 [N] Merging Y1 into Y
> |\ \
> | * | f361e9f [Y] Adding tmp7wtzvo69  <--- really Y'
> | * | 90d58eb [X] Adding tmpnxot0u9s
> | |/
> | * ed973e6 [G] Adding tmpb443aabz
> | * 74cd9b8 [E] Adding tmpwcrm4bxi
> * 3cc85cf [Y] Adding tmp7wtzvo69  <--- original Y
> * e93f6cb [X] Adding tmpnxot0u9s

I forgot to add the reference for how I generated that tree:

git clone git://git.openstack.org/openstack/git-upstream
cd git-upstream
cat <<EOF > test.yaml
- tree:
    - [A, []]
    - [E, [A]]
    - [G, [E]]
    - [I, [G]]
    - [X, [A]]
    - [Y, [X]]
    - [X1, [G]]
    - [Y1, [X1]]
    - [N, [Y, =Y1]]
    - [X2, [I]]
    - [Y2, [X2]]
    - [O, [N, =Y2]]

  branches:
    head: [local/mitaka, O]
    upstream: [stable/mitaka, I]
EOF
tox -e build-tree -- test.yaml
cd .git-test-trees/test

--
Regards,
Darragh Bailey
IRC: electrofelix
"Nothing is foolproof to a sufficiently talented fool" - Unknown