hg-stable: comparison tests/test-shelve.t

equal deleted inserted replaced

-:948691ea92a9
+:c829749e7639
 $ printf "z\na\n" > a/a
 $ hg unshelve --keep
 unshelving change 'default-01'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 4:32c69314e062 "changes to: [mq]: second.patch" (tip)
 merging a/a
 $ hg revert --all -q
 $ rm a/a.orig b.rename/b c.copy
 $ hg unshelve
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)
 merging a/a
 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ hg status -v
 $ hg unshelve --tool :merge-other --keep
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 6:2f694dd83a13 "changes to: second" (tip)
 merging a/a
 $ hg parents -q
 4:33f7f61e6c5e
 $ hg shelve -l
 default         (*)* changes to: second (glob)
 $ HGMERGE=true hg unshelve
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 6:2f694dd83a13 "changes to: second" (tip)
 merging a/a
-note: rebase of 6:2f694dd83a13 created no changes to commit
+note: unshelved changes already existed in the working copy
 $ hg parents -q
 4:33f7f61e6c5e
 $ hg shelve -l
 $ hg status
 A foo/foo
 merging x
 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 4:82a0d7d6ba61 "changes to: xyz" (tip)
 $ hg status
 M z
 $ cd ..
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ hg up -q 0e067c57feba
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 3:958bcbd1776e "changes to: c" (tip)
 $ hg status
 A d
 unshelve should work on an ancestor of the original commit
 $ hg up 3903775176ed
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 3:013284d9655e "changes to: b" (tip)
 $ hg status
 A d
 test bug 4073 we need to enable obsolete markers for it
 $ echo 1 > a
 $ hg unshelve --date '1073741824 0'
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
 merging f
 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ hg log -G --template '{rev}  {desc|firstline}  {author}  {date|isodate}'
 g
 $ hg unshelve
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
 $ hg st
 M a
 A f
 ? f.orig
 $ hg ci a -m 'intermediate other change'
 $ mv f.orig f
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 5:81152db69da7 "changes to: commit stuff" (tip)
 merging f
 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ hg st
 $ hg bookmark
 * test                      4:33f7f61e6c5e
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 5:e42a7da90865 "changes to: second" (tip)
 merging a/a
 warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ hg bookmark
 * test                      4:33f7f61e6c5e
 $ hg unshelve
 unshelving change 'test'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 6:96a1354f65f6 "changes to: create conflict" (tip)
 merging a/a
 $ hg bookmark
 * test                      4:33f7f61e6c5e
 $ cat a/a
 a
 ====
 $ hg unshelve --keep default
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 7:206bf5d4f922 "changes to: create conflict" (tip)
 ==== preupdate:
 VISIBLE 6:66b86db80ee4
 ACTUAL  5:703117a2acfb
 ====
 ==== preupdate:
-VISIBLE 8:a0e04704317e
+VISIBLE 8:92fdbb7b4de7
 ACTUAL  5:703117a2acfb
 ====
 ==== preupdate:
 VISIBLE 6:66b86db80ee4
 ACTUAL  5:703117a2acfb
 ====
 $ hg unshelve --keep default
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 7:206bf5d4f922 "changes to: create conflict" (tip)
 ==== update:
 VISIBLE 6:66b86db80ee4
 VISIBLE 7:206bf5d4f922
 ACTUAL  5:703117a2acfb
 ====
 A unknown
 $ hg unshelve
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 1:098df96e7410 "(changes in empty repository)" (tip)
 merging unknown
 $ hg status
 A unknown
 $ hg forget unknown
 $ rm unknown
 $ hg commit -qm "Add unknown"
 $ hg status
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 1:098df96e7410 "(changes in empty repository)" (tip)
 merging unknown
 $ hg status
 M unknown
 $ hg remove --force unknown
 $ hg commit -qm "Remove unknown"
 M a
 $ hg unshelve
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 2:425c97ef07f3 "changes to: a" (tip)
 merging a
 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ echo "aaabbbccc" > a
 $ hg update -r 7049e48789d7
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg unshelve
 unshelving change 'test'
 rebasing shelved changes
-rebasing 2:357525f34729 "changes to: test-commit" (tip)
 $ hg status
 A b
 $ hg branch
 default
 $ cd ..
 M a
 $ hg unshelve
 unshelving change 'default'
 temporarily committing pending changes (restore with 'hg unshelve --abort')
 rebasing shelved changes
-rebasing 2:425c97ef07f3 "changes to: a" (tip)
 merging a
 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ echo text2 > file && hg ci -Am text1
 adding file
 $ hg unshelve
 unshelving change 'default'
 rebasing shelved changes
-rebasing 1:396ea74229f9 "(changes in empty repository)" (tip)
 merging file
 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ echo somethingsomething > .hg/shelvedstate
 $ hg shelve --list
 default         (*s ago) * changes to: 1 (glob)
 $ hg unshelve --keep
 unshelving change 'default'
 rebasing shelved changes
-rebasing 2:3fbe6fbb0bef "changes to: 1" (tip)
 merging file
 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 $ hg resolve --mark file
 $ hg ci -Am a
 adding a
 $ hg unshelve
 unshelving change 'ashelve'
 rebasing shelved changes
-rebasing 2:003d2d94241c "changes to: root" (tip)
 merging a
 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
 [1]
 putting v1 shelvedstate file in place of a created v2

changeset 38618	c829749e7639
parent 38469	a8f99334ae31
child 38619	9b077e5fa8ba