#openttdcoop

ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg phase -d .
no phases changed
ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg phase -p 0
ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg glog
@  22:4338c1270633 tip 2015-06-03 10:19 +0200 (planetmaker)
|  	Added tag \ for changeset 888a9a6be6b3
|
o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
|\   	Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
| |
| o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
| |  	Change bar, part 2
| |
| o  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
| |  	Change bar, part 1
| |
o |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
|/   	Copy bar to bar2
|
o  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
|  	Add: files in two directories
|
o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
|\   	Merge other commit
| |
| o  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
| |  	More boo
| |
o |  14:ba06a91db43f 2015-02-06 18:42 +0100 (planetmaker)
| |  	Added tag blah for changeset 888a9a6be6b3
| |
o |  13:e5bbe08ad8f2 2015-02-06 18:42 +0100 (planetmaker)
| |  	Removed tag blah
| |
o |  12:3c7efd514ebd 2015-02-06 18:41 +0100 (planetmaker)
| |  	Added tag blah for changeset 0b428aa7bdf8
| |
o |  11:a6d327e12bc4 foo2 2014-11-14 14:19 +0100 (planetmaker)
|/   	Other blah commit
|
o  7:36479da8f266 2014-11-11 14:07 +0100 (planetmaker)
|  	Move foo2
|
o  6:0b428aa7bdf8 2014-11-11 14:06 +0100 (planetmaker)
|  	copy foo
|
o  5:888a9a6be6b3 \ blah 2014-04-17 14:22 +0200 (planetmaker)
|  	-Add: New cool feature
|
o  4:0602f70b6892 2014-04-17 14:22 +0200 (planetmaker)
|  	-Codechange: Introduce foo in preparation for cool stuff
|
o  0:4cd637edd9b5 2014-04-17 14:20 +0200 (planetmaker)
   	-Add: Initial check-in

ingo@aeolus hg-test default-r22 (tip) ~/hg-test $ hg up 17
2 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst
ingo@aeolus hg-test default-r17 ~/hg-test $ hg ci --amend -m "Add 2 files in directories"
5 new unstable changesets
ingo@aeolus hg-test default-r23 (tip) ~/hg-test $ hg glog -l10
@  23:d66c318abf69 tip 2015-03-03 14:16 +0100 (planetmaker)
|  	Add 2 files in directories
|
| o  22:4338c1270633 2015-06-03 10:19 +0200 (planetmaker)
| |  	Added tag \ for changeset 888a9a6be6b3
| |
| o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
| |\   	Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
| | |
| | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
| | |  	Change bar, part 2
| | |
| | o  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
| | |  	Change bar, part 1
| | |
| o |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
| |/   	Copy bar to bar2
| |
| x  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
|/   	Add: files in two directories
|
o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
|\   	Merge other commit
| |
| o  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
| |  	More boo
| |
o |  14:ba06a91db43f 2015-02-06 18:42 +0100 (planetmaker)
| |  	Added tag blah for changeset 888a9a6be6b3
| |
ingo@aeolus hg-test default-r23 (tip) ~/hg-test $ hg rebase -r18 -d23
rebasing 18:8741cc4edde5 "Copy bar to bar2"
ingo@aeolus hg-test default-r23 ~/hg-test $ hg glog -l10
o  24:df1649e9c3ae tip 2015-04-20 14:06 +0200 (planetmaker)
|  	Copy bar to bar2
|
@  23:d66c318abf69 2015-03-03 14:16 +0100 (planetmaker)
|  	Add 2 files in directories
|
| o  22:4338c1270633 2015-06-03 10:19 +0200 (planetmaker)
| |  	Added tag \ for changeset 888a9a6be6b3
| |
| o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
| |\   	Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
| | |
| | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
| | |  	Change bar, part 2
| | |
| | o  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
| | |  	Change bar, part 1
| | |
| x |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
| |/   	Copy bar to bar2
| |
| x  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
|/   	Add: files in two directories
|
o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
|\   	Merge other commit
| |
o |  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
| |  	More boo
| |
ingo@aeolus hg-test default-r23 ~/hg-test $ hg rebase -r19 -d23
rebasing 19:277c3869b443 "Change bar, part 1"
ingo@aeolus hg-test default-r23 ~/hg-test $ hg glog -l10
o  25:d66c046c9463 tip 2015-04-20 14:07 +0200 (planetmaker)
|  	Change bar, part 1
|
| o  24:df1649e9c3ae 2015-04-20 14:06 +0200 (planetmaker)
|/   	Copy bar to bar2
|
@  23:d66c318abf69 2015-03-03 14:16 +0100 (planetmaker)
|  	Add 2 files in directories
|
| o  22:4338c1270633 2015-06-03 10:19 +0200 (planetmaker)
| |  	Added tag \ for changeset 888a9a6be6b3
| |
| o    21:b2a1a800dcf0 2015-04-20 14:12 +0200 (planetmaker)
| |\   	Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
| | |
| | o  20:c5019cc5e98c 2015-04-20 14:07 +0200 (planetmaker)
| | |  	Change bar, part 2
| | |
| | x  19:277c3869b443 2015-04-20 14:07 +0200 (planetmaker)
| | |  	Change bar, part 1
| | |
| x |  18:8741cc4edde5 2015-04-20 14:06 +0200 (planetmaker)
| |/   	Copy bar to bar2
| |
| x  17:f26c3b5a4767 2015-03-03 14:16 +0100 (planetmaker)
|/   	Add: files in two directories
|
o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
|\   	Merge other commit
| |
ingo@aeolus hg-test default-r23 ~/hg-test $ hg rebase -r20 -d25
rebasing 20:c5019cc5e98c "Change bar, part 2"
ingo@aeolus hg-test default-r23 ~/hg-test $ hg rebase -b21 -d24
rebasing 17:f26c3b5a4767 "Add: files in two directories"
note: rebase of 17:f26c3b5a4767 created no changes to commit
rebasing 18:8741cc4edde5 "Copy bar to bar2"
note: rebase of 18:8741cc4edde5 created no changes to commit
rebasing 19:277c3869b443 "Change bar, part 1"
Führe bar2 und bar zusammen zu bar2
rebasing 20:c5019cc5e98c "Change bar, part 2"
Führe bar2 und bar zusammen zu bar2
rebasing 21:b2a1a800dcf0 "Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'"
rebasing 22:4338c1270633 "Added tag \ for changeset 888a9a6be6b3"
4 new divergent changesets
ingo@aeolus hg-test default-r23 ~/hg-test $ hg glog -l15
o  30:e7cdac655f08 tip 2015-06-03 10:19 +0200 (planetmaker)
|  	Added tag \ for changeset 888a9a6be6b3
|
o    29:624826a28736 2015-04-20 14:12 +0200 (planetmaker)
|\   	Merge. See how the bar2 receives also all changes made to the unrenamed file 'bar'
| |
| o  28:7ecb1e7996c9 2015-04-20 14:07 +0200 (planetmaker)
| |  	Change bar, part 2
| |
| o  27:00220bf9b94b 2015-04-20 14:07 +0200 (planetmaker)
|/   	Change bar, part 1
|
| o  26:e20d83838da7 2015-04-20 14:07 +0200 (planetmaker)
| |  	Change bar, part 2
| |
| o  25:d66c046c9463 2015-04-20 14:07 +0200 (planetmaker)
| |  	Change bar, part 1
| |
o |  24:df1649e9c3ae 2015-04-20 14:06 +0200 (planetmaker)
|/   	Copy bar to bar2
|
@  23:d66c318abf69 2015-03-03 14:16 +0100 (planetmaker)
|  	Add 2 files in directories
|
o    16:e7b51f7cf918 2015-02-10 22:58 +0100 (planetmaker)
|\   	Merge other commit
| |
| o  15:441bead3e0b3 2015-02-10 22:58 +0100 (planetmaker)
| |  	More boo
| |
o |  14:ba06a91db43f 2015-02-06 18:42 +0100 (planetmaker)
| |  	Added tag blah for changeset 888a9a6be6b3
| |
o |  13:e5bbe08ad8f2 2015-02-06 18:42 +0100 (planetmaker)
| |  	Removed tag blah
| |
o |  12:3c7efd514ebd 2015-02-06 18:41 +0100 (planetmaker)
| |  	Added tag blah for changeset 0b428aa7bdf8
| |
o |  11:a6d327e12bc4 foo2 2014-11-14 14:19 +0100 (planetmaker)
|/   	Other blah commit
|
o  7:36479da8f266 2014-11-11 14:07 +0100 (planetmaker)
|  	Move foo2
|

Mark as private