Commits

Patrick Mézard committed 8d1a8ee

test-obsolete-rebase.t: test --abort and --continue

Comments (0)

Files changed (1)

tests/test-obsolete-rebase.t

   076e9b2ffbe1 a7773ffa7edc
   102a90ea7b4a 03f017c74faa
   4e322f7ce8e3 000000000000
+
+Test rebase --abort
+
+  $ hg debugsuccessors > ../successors.old
+  $ hg up 0
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo d > d
+  $ hg ci -Am addd d
+  created new head
+  $ echo b >> a
+  $ hg ci -m appendab
+  $ hg rebase -d 1
+  merging a
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  [255]
+  $ hg rebase --abort
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg
+  rebase aborted
+  $ hg debugsuccessors > ../successors.new
+  $ diff -u ../successors.old ../successors.new
+
+Test rebase --continue
+
+  $ hg rebase -d 1
+  merging a
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+  [255]
+  $ hg resolve --tool internal:other a
+  $ hg rebase --continue
+  $ glog --hidden
+  @  11:1951ead97108@default(draft) appendab
+  |
+  o  10:03f165c84ea8@default(draft) addd
+  |
+  | o  9:4b9d80f48523@default(secret) appendab
+  | |
+  | o  8:a31943eabc43@default(secret) addd
+  | |
+  +---o  7:a7773ffa7edc@default(draft) Collapsed revision
+  | |
+  | | o  6:03f31481307a@default(secret) changec
+  | | |
+  | | o  5:076e9b2ffbe1@default(secret) addc
+  | |/
+  | | o  4:4e322f7ce8e3@foo(secret) changea
+  | |/
+  +---o  3:03f017c74faa@default(draft) addb
+  | |
+  | | o  2:102a90ea7b4a@default(secret) addb
+  | |/
+  o |  1:540395c44225@default(draft) changea
+  |/
+  o  0:07f494440405@default(draft) adda
+  
+  $ hg debugsuccessors > ../successors.new
+  $ diff -u ../successors.old ../successors.new
+  --- ../successors.old* (glob)
+  +++ ../successors.new* (glob)
+  @@ -1,4 +1,6 @@
+   03f31481307a a7773ffa7edc
+   076e9b2ffbe1 a7773ffa7edc
+   102a90ea7b4a 03f017c74faa
+  +4b9d80f48523 1951ead97108
+   4e322f7ce8e3 000000000000
+  +a31943eabc43 03f165c84ea8
+  [1]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.