--- a/tests/test-rebase-collapse.t Tue Mar 20 17:25:16 2018 -0700
+++ b/tests/test-rebase-collapse.t Sun Mar 18 15:25:23 2018 -0700
@@ -2,6 +2,7 @@
> [extensions]
> rebase=
> mq=
+ > drawdag=$TESTDIR/drawdag.py
>
> [phases]
> publish=False
@@ -11,47 +12,21 @@
> tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n"
> EOF
-Create repo a:
-
- $ hg init a
- $ cd a
- $ hg unbundle "$TESTDIR/bundles/rebase.hg"
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
- (run 'hg heads' to see heads, 'hg merge' to merge)
- $ hg up tip
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+Highest phase of source commits is used:
- $ hg tglog
- @ 7: 02de42196ebe 'H'
- |
- | o 6: eea13746799a 'G'
- |/|
- o | 5: 24b6387c8c8c 'F'
- | |
- | o 4: 9520eea781bc 'E'
- |/
- | o 3: 32af7686d403 'D'
- | |
- | o 2: 5fddd98957c8 'C'
- | |
- | o 1: 42ccdea3bb16 'B'
- |/
- o 0: cd010b8cd998 'A'
-
- $ cd ..
+ $ hg init phase
+ $ cd phase
+ $ hg debugdrawdag << 'EOF'
+ > D
+ > |
+ > F C
+ > | |
+ > E B
+ > |/
+ > A
+ > EOF
-
-Rebasing B onto H and collapsing changesets with different phases:
-
-
- $ hg clone -q -u 3 a a1
- $ cd a1
-
- $ hg phase --force --secret 3
+ $ hg phase --force --secret D
$ cat > $TESTTMP/editor.sh <<EOF
> echo "==== before editing"
@@ -59,10 +34,10 @@
> echo "===="
> echo "edited manually" >> \$1
> EOF
- $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest 7
- rebasing 1:42ccdea3bb16 "B"
- rebasing 2:5fddd98957c8 "C"
- rebasing 3:32af7686d403 "D"
+ $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest F
+ rebasing 1:112478962961 "B" (B)
+ rebasing 3:26805aba1e60 "C" (C)
+ rebasing 5:f585351a92f8 "D" (D tip)
==== before editing
Collapsed revision
* B
@@ -73,84 +48,91 @@
HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit.
HG: --
- HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
+ HG: user: test
HG: branch 'default'
HG: added B
HG: added C
HG: added D
====
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
+ saved backup bundle to $TESTTMP/phase/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg
$ hg tglogp
- @ 5: 30882080ba93 secret 'Collapsed revision
+ o 3: 92fa5f5fe108 secret 'Collapsed revision
| * B
| * C
| * D
|
|
| edited manually'
- o 4: 02de42196ebe draft 'H'
+ o 2: 64a8289d2492 draft 'F'
|
- | o 3: eea13746799a draft 'G'
- |/|
- o | 2: 24b6387c8c8c draft 'F'
- | |
- | o 1: 9520eea781bc draft 'E'
- |/
- o 0: cd010b8cd998 draft 'A'
+ o 1: 7fb047a69f22 draft 'E'
+ |
+ o 0: 426bada5c675 draft 'A'
$ hg manifest --rev tip
A
B
C
D
+ E
F
- H
$ cd ..
-Rebasing E onto H:
+Merge gets linearized:
- $ hg clone -q -u . a a2
- $ cd a2
+ $ hg init linearized-merge
+ $ cd linearized-merge
- $ hg phase --force --secret 6
- $ hg rebase --source 4 --collapse --dest 7
- rebasing 4:9520eea781bc "E"
- rebasing 6:eea13746799a "G"
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
+ $ hg debugdrawdag << 'EOF'
+ > F D
+ > |/|
+ > C B
+ > |/
+ > A
+ > EOF
+
+ $ hg phase --force --secret D
+ $ hg rebase --source B --collapse --dest F
+ rebasing 1:112478962961 "B" (B)
+ rebasing 3:4e4f9194f9f1 "D" (D)
+ saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg
$ hg tglog
- o 6: 7dd333a2d1e4 'Collapsed revision
- | * E
- | * G'
- @ 5: 02de42196ebe 'H'
- |
- o 4: 24b6387c8c8c 'F'
+ o 3: 5bdc08b7da2b 'Collapsed revision
+ | * B
+ | * D'
+ o 2: afc707c82df0 'F'
|
- | o 3: 32af7686d403 'D'
- | |
- | o 2: 5fddd98957c8 'C'
- | |
- | o 1: 42ccdea3bb16 'B'
- |/
- o 0: cd010b8cd998 'A'
+ o 1: dc0947a82db8 'C'
+ |
+ o 0: 426bada5c675 'A'
$ hg manifest --rev tip
A
- E
+ B
+ C
F
- H
$ cd ..
-Rebasing G onto H with custom message:
+Custom message:
+
+ $ hg init message
+ $ cd message
- $ hg clone -q -u . a a3
- $ cd a3
+ $ hg debugdrawdag << 'EOF'
+ > C
+ > |
+ > D B
+ > |/
+ > A
+ > EOF
- $ hg rebase --base 6 -m 'custom message'
+
+ $ hg rebase --base B -m 'custom message'
abort: message can only be specified with collapse
[255]
@@ -158,144 +140,77 @@
> env | grep HGEDITFORM
> true
> EOF
- $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e --dest 7
- rebasing 4:9520eea781bc "E"
- rebasing 6:eea13746799a "G"
+ $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D
+ rebasing 1:112478962961 "B" (B)
+ rebasing 3:26805aba1e60 "C" (C tip)
HGEDITFORM=rebase.collapse
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
+ saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg
$ hg tglog
- o 6: 38ed6a6b026b 'custom message'
- |
- @ 5: 02de42196ebe 'H'
- |
- o 4: 24b6387c8c8c 'F'
+ o 2: 2f197b9a08f3 'custom message'
|
- | o 3: 32af7686d403 'D'
- | |
- | o 2: 5fddd98957c8 'C'
- | |
- | o 1: 42ccdea3bb16 'B'
- |/
- o 0: cd010b8cd998 'A'
+ o 1: b18e25de2cf5 'D'
+ |
+ o 0: 426bada5c675 'A'
$ hg manifest --rev tip
A
- E
- F
- H
+ B
+ C
+ D
$ cd ..
-Create repo b:
-
- $ hg init b
- $ cd b
-
- $ echo A > A
- $ hg ci -Am A
- adding A
- $ echo B > B
- $ hg ci -Am B
- adding B
-
- $ hg up -q 0
-
- $ echo C > C
- $ hg ci -Am C
- adding C
- created new head
-
- $ hg merge
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (branch merge, don't forget to commit)
-
- $ echo D > D
- $ hg ci -Am D
- adding D
-
- $ hg up -q 1
-
- $ echo E > E
- $ hg ci -Am E
- adding E
- created new head
-
- $ echo F > F
- $ hg ci -Am F
- adding F
-
- $ hg merge
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (branch merge, don't forget to commit)
- $ hg ci -m G
-
- $ hg up -q 0
-
- $ echo H > H
- $ hg ci -Am H
- adding H
- created new head
-
- $ hg tglog
- @ 7: c65502d41787 'H'
- |
- | o 6: c772a8b2dc17 'G'
- | |\
- | | o 5: 7f219660301f 'F'
- | | |
- | | o 4: 8a5212ebc852 'E'
- | | |
- | o | 3: 2870ad076e54 'D'
- | |\|
- | o | 2: c5cefa58fd55 'C'
- |/ /
- | o 1: 27547f69f254 'B'
- |/
- o 0: 4a2df7238c3b 'A'
-
- $ cd ..
-
-
Rebase and collapse - more than one external (fail):
- $ hg clone -q -u . b b1
- $ cd b1
+ $ hg init multiple-external-parents
+ $ cd multiple-external-parents
- $ hg rebase -s 2 --dest 7 --collapse
- abort: unable to collapse on top of 7, there is more than one external parent: 1, 5
+ $ hg debugdrawdag << 'EOF'
+ > G
+ > |\
+ > | F
+ > | |
+ > D E
+ > |\|
+ > H C B
+ > \|/
+ > A
+ > EOF
+
+ $ hg rebase -s C --dest H --collapse
+ abort: unable to collapse on top of 3, there is more than one external parent: 1, 6
[255]
Rebase and collapse - E onto H:
- $ hg rebase -s 4 --dest 7 --collapse # root (4) is not a merge
- rebasing 4:8a5212ebc852 "E"
- rebasing 5:7f219660301f "F"
- rebasing 6:c772a8b2dc17 "G"
- saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-rebase.hg
+ $ hg rebase -s E --dest I --collapse # root (E) is not a merge
+ abort: unknown revision 'I'!
+ [255]
$ hg tglog
- o 5: f97c4725bd99 'Collapsed revision
- |\ * E
- | | * F
- | | * G'
- | @ 4: c65502d41787 'H'
+ o 7: 64e264db77f0 'G'
+ |\
+ | o 6: 11abe3fb10b8 'F'
+ | |
+ | o 5: 49cb92066bfd 'E'
| |
- o | 3: 2870ad076e54 'D'
- |\ \
- | o | 2: c5cefa58fd55 'C'
- | |/
- o / 1: 27547f69f254 'B'
+ o | 4: 4e4f9194f9f1 'D'
+ |\|
+ | | o 3: 575c4b5ec114 'H'
+ | | |
+ o---+ 2: dc0947a82db8 'C'
+ / /
+ o / 1: 112478962961 'B'
|/
- o 0: 4a2df7238c3b 'A'
+ o 0: 426bada5c675 'A'
$ hg manifest --rev tip
A
+ B
C
- D
E
F
- H
$ cd ..
@@ -308,146 +223,98 @@
3). The code is now much simpler and we could just test a simpler scenario
We keep it the test this way in case new complexity is injected.
- $ hg clone -q -u . b b2
- $ cd b2
+Create repo b:
+
+ $ hg init branch-heads
+ $ cd branch-heads
+
+ $ hg debugdrawdag << 'EOF'
+ > G
+ > |\
+ > | F
+ > | |
+ > D E
+ > |\|
+ > H C B
+ > \|/
+ > A
+ > EOF
$ hg heads --template="{rev}:{node} {branch}\n"
- 7:c65502d4178782309ce0574c5ae6ee9485a9bafa default
- 6:c772a8b2dc17629cec88a19d09c926c4814b12c7 default
+ 7:64e264db77f061f16d9132b70c5a58e2461fb630 default
+ 3:575c4b5ec114d64b681d33f8792853568bfb2b2c default
- $ cat $TESTTMP/b2/.hg/cache/branch2-served
- c65502d4178782309ce0574c5ae6ee9485a9bafa 7
- c772a8b2dc17629cec88a19d09c926c4814b12c7 o default
- c65502d4178782309ce0574c5ae6ee9485a9bafa o default
+ $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
+ 64e264db77f061f16d9132b70c5a58e2461fb630 7
+ 575c4b5ec114d64b681d33f8792853568bfb2b2c o default
+ 64e264db77f061f16d9132b70c5a58e2461fb630 o default
$ hg strip 4
- saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg
+ saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg
- $ cat $TESTTMP/b2/.hg/cache/branch2-served
- c65502d4178782309ce0574c5ae6ee9485a9bafa 4
- 2870ad076e541e714f3c2bc32826b5c6a6e5b040 o default
- c65502d4178782309ce0574c5ae6ee9485a9bafa o default
+ $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served
+ 11abe3fb10b8689b560681094b17fe161871d043 5
+ dc0947a82db884575bb76ea10ac97b08536bfa03 o default
+ 575c4b5ec114d64b681d33f8792853568bfb2b2c o default
+ 11abe3fb10b8689b560681094b17fe161871d043 o default
$ hg heads --template="{rev}:{node} {branch}\n"
- 4:c65502d4178782309ce0574c5ae6ee9485a9bafa default
- 3:2870ad076e541e714f3c2bc32826b5c6a6e5b040 default
+ 5:11abe3fb10b8689b560681094b17fe161871d043 default
+ 3:575c4b5ec114d64b681d33f8792853568bfb2b2c default
+ 2:dc0947a82db884575bb76ea10ac97b08536bfa03 default
$ cd ..
-
-
-
-Create repo c:
-
- $ hg init c
- $ cd c
+Preserves external parent
- $ echo A > A
- $ hg ci -Am A
- adding A
- $ echo B > B
- $ hg ci -Am B
- adding B
-
- $ hg up -q 0
-
- $ echo C > C
- $ hg ci -Am C
- adding C
- created new head
-
- $ hg merge
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (branch merge, don't forget to commit)
+ $ hg init external-parent
+ $ cd external-parent
- $ echo D > D
- $ hg ci -Am D
- adding D
-
- $ hg up -q 1
-
- $ echo E > E
- $ hg ci -Am E
- adding E
- created new head
- $ echo F > E
- $ hg ci -m 'F'
+ $ hg debugdrawdag << 'EOF'
+ > H
+ > |\
+ > | G
+ > | |
+ > | F # F/E = F\n
+ > | |
+ > D E # D/D = D\n
+ > |\|
+ > I C B
+ > \|/
+ > A
+ > EOF
- $ echo G > G
- $ hg ci -Am G
- adding G
-
- $ hg merge
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (branch merge, don't forget to commit)
-
- $ hg ci -m H
-
- $ hg up -q 0
-
- $ echo I > I
- $ hg ci -Am I
- adding I
- created new head
+ $ hg rebase -s F --dest I --collapse # root (F) is not a merge
+ rebasing 6:c82b08f646f1 "F" (F)
+ rebasing 7:a6db7fa104e1 "G" (G)
+ rebasing 8:e1d201b72d91 "H" (H tip)
+ saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg
$ hg tglog
- @ 8: 46d6f0e29c20 'I'
- |
- | o 7: 417d3b648079 'H'
- | |\
- | | o 6: 55a44ad28289 'G'
- | | |
- | | o 5: dca5924bb570 'F'
- | | |
- | | o 4: 8a5212ebc852 'E'
- | | |
- | o | 3: 2870ad076e54 'D'
- | |\|
- | o | 2: c5cefa58fd55 'C'
- |/ /
- | o 1: 27547f69f254 'B'
- |/
- o 0: 4a2df7238c3b 'A'
-
- $ cd ..
-
-
-Rebase and collapse - E onto I:
-
- $ hg clone -q -u . c c1
- $ cd c1
-
- $ hg rebase -s 4 --dest 8 --collapse # root (4) is not a merge
- rebasing 4:8a5212ebc852 "E"
- rebasing 5:dca5924bb570 "F"
- merging E
- rebasing 6:55a44ad28289 "G"
- rebasing 7:417d3b648079 "H"
- saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-rebase.hg
-
- $ hg tglog
- o 5: 340b34a63b39 'Collapsed revision
- |\ * E
- | | * F
+ o 6: 681daa3e686d 'Collapsed revision
+ |\ * F
| | * G
| | * H'
- | @ 4: 46d6f0e29c20 'I'
- | |
- o | 3: 2870ad076e54 'D'
- |\ \
- | o | 2: c5cefa58fd55 'C'
- | |/
- o / 1: 27547f69f254 'B'
+ | | o 5: 49cb92066bfd 'E'
+ | | |
+ | o | 4: 09143c0bf13e 'D'
+ | |\|
+ o | | 3: 08ebfeb61bac 'I'
+ | | |
+ | o | 2: dc0947a82db8 'C'
+ |/ /
+ | o 1: 112478962961 'B'
|/
- o 0: 4a2df7238c3b 'A'
+ o 0: 426bada5c675 'A'
$ hg manifest --rev tip
A
C
D
E
+ F
G
I
@@ -458,77 +325,38 @@
$ cd ..
-Create repo d:
-
- $ hg init d
- $ cd d
+With internal merge:
- $ echo A > A
- $ hg ci -Am A
- adding A
- $ echo B > B
- $ hg ci -Am B
- adding B
- $ echo C > C
- $ hg ci -Am C
- adding C
-
- $ hg up -q 1
+ $ hg init internal-merge
+ $ cd internal-merge
- $ echo D > D
- $ hg ci -Am D
- adding D
- created new head
- $ hg merge
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (branch merge, don't forget to commit)
+ $ hg debugdrawdag << 'EOF'
+ > E
+ > |\
+ > C D
+ > |/
+ > F B
+ > |/
+ > A
+ > EOF
- $ hg ci -m E
- $ hg up -q 0
-
- $ echo F > F
- $ hg ci -Am F
- adding F
- created new head
+ $ hg rebase -s B --collapse --dest F
+ rebasing 1:112478962961 "B" (B)
+ rebasing 3:26805aba1e60 "C" (C)
+ rebasing 4:be0ef73c17ad "D" (D)
+ rebasing 5:02c4367d6973 "E" (E tip)
+ saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg
$ hg tglog
- @ 5: c137c2b8081f 'F'
- |
- | o 4: 0a42590ed746 'E'
- | |\
- | | o 3: 7bbcd6078bcc 'D'
- | | |
- | o | 2: f838bfaca5c7 'C'
- | |/
- | o 1: 27547f69f254 'B'
- |/
- o 0: 4a2df7238c3b 'A'
-
- $ cd ..
-
-
-Rebase and collapse - B onto F:
-
- $ hg clone -q -u . d d1
- $ cd d1
-
- $ hg rebase -s 1 --collapse --dest 5
- rebasing 1:27547f69f254 "B"
- rebasing 2:f838bfaca5c7 "C"
- rebasing 3:7bbcd6078bcc "D"
- rebasing 4:0a42590ed746 "E"
- saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-rebase.hg
-
- $ hg tglog
- o 2: b72eaccb283f 'Collapsed revision
+ o 2: c0512a1797b0 'Collapsed revision
| * B
| * C
| * D
| * E'
- @ 1: c137c2b8081f 'F'
+ o 1: 8908a377a434 'F'
|
- o 0: 4a2df7238c3b 'A'
+ o 0: 426bada5c675 'A'
$ hg manifest --rev tip
A
@@ -536,9 +364,9 @@
C
D
F
+ $ cd ..
Interactions between collapse and keepbranches
- $ cd ..
$ hg init e
$ cd e
$ echo 'a' > a
@@ -733,46 +561,28 @@
$ hg init f
$ cd f
- $ echo A > A
- $ hg ci -Am A
- adding A
- $ echo B > B
- $ hg ci -Am B
- adding B
+ $ hg debugdrawdag << 'EOF'
+ > C B
+ > |/
+ > A
+ > EOF
- $ hg up -q 0
+ $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
+ 2:dc0947a82db884575bb76ea10ac97b08536bfa03 default: C
+ 1:112478962961147124edd43549aedd1a335e44bf default: B
- $ echo C > C
- $ hg ci -Am C
- adding C
- created new head
+ $ hg strip C
+ saved backup bundle to $TESTTMP/f/.hg/strip-backup/dc0947a82db8-d21b92a4-backup.hg
$ hg tglog
- @ 2: c5cefa58fd55 'C'
+ o 1: 112478962961 'B'
|
- | o 1: 27547f69f254 'B'
- |/
- o 0: 4a2df7238c3b 'A'
+ o 0: 426bada5c675 'A'
$ hg heads --template="{rev}:{node} {branch}: {desc}\n"
- 2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C
- 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B
-
- $ hg strip 2
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg
-
- $ hg tglog
- o 1: 27547f69f254 'B'
- |
- @ 0: 4a2df7238c3b 'A'
-
-
-
- $ hg heads --template="{rev}:{node} {branch}: {desc}\n"
- 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B
+ 1:112478962961147124edd43549aedd1a335e44bf default: B
$ cd ..
@@ -812,46 +622,41 @@
$ hg init collapse_remember_message
$ cd collapse_remember_message
- $ touch a
- $ hg add a
- $ hg commit -m "a"
- $ echo "a-default" > a
- $ hg commit -m "a-default"
- $ hg update -r 0
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg branch dev
- marked working directory as branch dev
- (branches are permanent and global, did you want a bookmark?)
- $ echo "a-dev" > a
- $ hg commit -m "a-dev"
- $ hg rebase --collapse -m "a-default-dev" -d 1
- rebasing 2:b8d8db2b242d "a-dev" (tip)
- merging a
- warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+ $ hg debugdrawdag << 'EOF'
+ > C B # B/A = B\n
+ > |/ # C/A = C\n
+ > A
+ > EOF
+ $ hg rebase --collapse -m "new message" -b B -d C
+ rebasing 1:81e5401e4d37 "B" (B)
+ merging A
+ warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
- $ rm a.orig
- $ hg resolve --mark a
+ $ rm A.orig
+ $ hg resolve --mark A
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
- rebasing 2:b8d8db2b242d "a-dev" (tip)
- saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-rebase.hg
+ rebasing 1:81e5401e4d37 "B" (B)
+ saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg
$ hg log
- changeset: 2:45ba1d1a8665
+ changeset: 2:17186933e123
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- summary: a-default-dev
+ summary: new message
- changeset: 1:3c8db56a44bc
+ changeset: 1:043039e9df84
+ tag: C
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- summary: a-default
+ summary: C
- changeset: 0:3903775176ed
+ changeset: 0:426bada5c675
+ tag: A
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- summary: a
+ summary: A
$ cd ..