Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 32313:a580b2d65ded
rebase: make sure merge state is cleaned up for no-op rebases (issue5494)
If a rebase ends up doing a no-op commit, make sure the merge state is still cleaned up.
author | Jeremy Fitzhardinge <jsgf@fb.com> |
---|---|
date | Thu, 18 May 2017 13:18:05 -0700 |
parents | 27e67cfea27f |
children | 40ee74bfa111 |
comparison
equal
deleted
inserted
replaced
32312:0d6b3572ad92 | 32313:a580b2d65ded |
---|---|
270 | o 1:public 'B' | 270 | o 1:public 'B' |
271 |/ | 271 |/ |
272 o 0:public 'A' | 272 o 0:public 'A' |
273 | 273 |
274 $ cd .. | 274 $ cd .. |
275 | |
276 Make sure merge state is cleaned up after a no-op rebase merge (issue5494) | |
277 $ hg init repo | |
278 $ cd repo | |
279 $ echo a > a | |
280 $ hg commit -qAm base | |
281 $ echo b >> a | |
282 $ hg commit -qm b | |
283 $ hg up '.^' | |
284 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
285 $ echo c >> a | |
286 $ hg commit -qm c | |
287 $ hg rebase -s 1 -d 2 --noninteractive | |
288 rebasing 1:fdaca8533b86 "b" | |
289 merging a | |
290 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
291 unresolved conflicts (see hg resolve, then hg rebase --continue) | |
292 [1] | |
293 $ echo a > a | |
294 $ echo c >> a | |
295 $ hg resolve --mark a | |
296 (no more unresolved files) | |
297 continue: hg rebase --continue | |
298 $ hg rebase --continue | |
299 rebasing 1:fdaca8533b86 "b" | |
300 note: rebase of 1:fdaca8533b86 created no changes to commit | |
301 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-backup.hg (glob) | |
302 $ hg resolve --list | |
303 $ test -f .hg/merge | |
304 [1] | |
305 |