equal
deleted
inserted
replaced
46 $ rm p1.patch |
46 $ rm p1.patch |
47 |
47 |
48 $ hg up -q -C qtip |
48 $ hg up -q -C qtip |
49 |
49 |
50 $ hg rebase |
50 $ hg rebase |
51 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
51 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
52 |
52 |
53 $ hg tglog |
53 $ hg tglog |
54 @ 3: 'P0' tags: p0.patch qbase qtip tip |
54 @ 3: 'P0' tags: p0.patch qbase qtip tip |
55 | |
55 | |
56 o 2: 'P1' tags: qparent |
56 o 2: 'P1' tags: qparent |
109 [255] |
109 [255] |
110 |
110 |
111 $ HGMERGE=internal:local hg resolve --all |
111 $ HGMERGE=internal:local hg resolve --all |
112 |
112 |
113 $ hg rebase --continue |
113 $ hg rebase --continue |
114 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
114 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
115 |
115 |
116 $ hg tglog |
116 $ hg tglog |
117 @ 9: 'r5' tags: 5.diff qtip tip |
117 @ 9: 'r5' tags: 5.diff qtip tip |
118 | |
118 | |
119 o 8: 'r4' tags: 4.diff |
119 o 8: 'r4' tags: 4.diff |