##// END OF EJS Templates
tests: move non-collapse test out of test-rebase-collapse...
Martin von Zweigbergk -
r44604:45ec64d9 default
parent child Browse files
Show More
@@ -486,61 +486,6 b' Interactions between collapse and keepbr'
486 486 abort: cannot collapse multiple named branches
487 487 [255]
488 488
489 $ repeatchange() {
490 > hg checkout $1
491 > hg cp d z
492 > echo blah >> z
493 > hg commit -Am "$2" --user "$3"
494 > }
495 $ repeatchange 3 "E" "user1"
496 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
497 $ repeatchange 3 "E" "user2"
498 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
499 created new head
500 $ hg tglog
501 @ 5: fbfb97b1089a 'E'
502 |
503 | o 4: f338eb3c2c7c 'E'
504 |/
505 o 3: 41acb9dca9eb 'D'
506 |
507 | o 2: 8ac4a08debf1 'C' two
508 | |
509 | o 1: 1ba175478953 'B' one
510 |/
511 o 0: 1994f17a630e 'A'
512
513 $ hg rebase -s 5 -d 4
514 rebasing 5:fbfb97b1089a "E" (tip)
515 note: not rebasing 5:fbfb97b1089a "E" (tip), its destination already has all its changes
516 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
517 $ hg tglog
518 @ 4: f338eb3c2c7c 'E'
519 |
520 o 3: 41acb9dca9eb 'D'
521 |
522 | o 2: 8ac4a08debf1 'C' two
523 | |
524 | o 1: 1ba175478953 'B' one
525 |/
526 o 0: 1994f17a630e 'A'
527
528 $ hg export tip
529 # HG changeset patch
530 # User user1
531 # Date 0 0
532 # Thu Jan 01 00:00:00 1970 +0000
533 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213
534 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09
535 E
536
537 diff -r 41acb9dca9eb -r f338eb3c2c7c z
538 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
539 +++ b/z Thu Jan 01 00:00:00 1970 +0000
540 @@ -0,0 +1,2 @@
541 +d
542 +blah
543
544 489 $ cd ..
545 490
546 491 Rebase, collapse and copies
@@ -108,6 +108,62 b' Rebased revision does not contain inform'
108 108
109 109
110 110
111 $ repeatchange() {
112 > hg checkout $1
113 > hg cp a z
114 > echo blah >> z
115 > hg commit -Am "$2" --user "$3"
116 > }
117 $ repeatchange 1 "E" "user1"
118 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
119 created new head
120 $ repeatchange 1 "E" "user2"
121 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
122 created new head
123 $ hg tglog
124 @ 5: af8ad1f97097 'E'
125 |
126 | o 4: 60f545c27784 'E'
127 |/
128 | o 3: 032a9b75e83b 'rename A'
129 | |
130 | o 2: 220d0626d185 'rename B'
131 |/
132 o 1: 3ab5da9a5c01 'B'
133 |
134 o 0: 1994f17a630e 'A'
135
136 $ hg rebase -s 5 -d 4
137 rebasing 5:af8ad1f97097 "E" (tip)
138 note: not rebasing 5:af8ad1f97097 "E" (tip), its destination already has all its changes
139 saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg
140 $ hg tglog
141 @ 4: 60f545c27784 'E'
142 |
143 | o 3: 032a9b75e83b 'rename A'
144 | |
145 | o 2: 220d0626d185 'rename B'
146 |/
147 o 1: 3ab5da9a5c01 'B'
148 |
149 o 0: 1994f17a630e 'A'
150
151 $ hg export tip
152 # HG changeset patch
153 # User user1
154 # Date 0 0
155 # Thu Jan 01 00:00:00 1970 +0000
156 # Node ID 60f545c277846e6bad309919bae3ae106f59cb39
157 # Parent 3ab5da9a5c01faa02c20f2ec4870a4f689c92da6
158 E
159
160 diff -r 3ab5da9a5c01 -r 60f545c27784 z
161 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
162 +++ b/z Thu Jan 01 00:00:00 1970 +0000
163 @@ -0,0 +1,2 @@
164 +a
165 +blah
166
111 167 $ cd ..
112 168
113 169
General Comments 0
You need to be logged in to leave comments. Login now