hg shelve가 커밋을 만들었습니다. 이해가 안됩니다.

Question

설명서가 다소 희박하기 때문에 약간 혼란 스럽습니다. hg shelve으로 혼란 스럽습니다. 아무 래도 나는 형태의 나의 로그에 커밋을 가지고있다 :

changeset: 29:ad47ed1ca915 
parent:  27:afca280f2884 
user:  shelve@localhost 
date:  Wed Jun 08 15:30:36 2016 -0600 
summary:  changes to: ... 

나는이 출처에 관해서 혼란스러워한다. 선반은 물건을 현지 기계에 쌓아 두었고 역사에 들지 않을 것이라는 것을 이해했습니다. 나는 그것을 오해하고 있는가?

이

hg status 
    hg shelve list 
    hg shelve --list 
    hg unshelve 
    hg unshelve 
    hg resolve 
    hg resolve -all 
    hg resolve --all 
    hg resolve --all 
    hg clone a/ b 
    # By this point we have the commit (since 28 is after 27) 
    hg update -r 28 

편집 :

좋아, 그래서 문제가 부분 unshelve 것 같다

여기 내 HG의 명령 기록입니다. 내가 지금은 변경 집합에 붙어 및 :(

EDIT2을 할 것을 확실하지 않다 다른 변경 집합을 끌어 때문에, :

~ $ cd tmp 
~/tmp $ mkdir shelve shelve/a 
~/tmp $ cd shelve/a 
~/tmp/shelve/a $ hg init 
~/tmp/shelve/a $ echo a > a 
~/tmp/shelve/a $ hg add a 
~/tmp/shelve/a $ hg commit -m "a as a" 
~/tmp/shelve/a $ cd .. 
~/tmp/shelve $ hg clone a b 
updating to branch default 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 
~/tmp/shelve $ cd b 
~/tmp/shelve/b $ echo aa > a 
~/tmp/shelve/b $ hg commit -m "a as aa" 
~/tmp/shelve/b $ cd ../a 
~/tmp/shelve/a $ echo aaa > a 
~/tmp/shelve/a $ hg shelve 
shelved as default 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 
~/tmp/shelve/a $ hg pull -u ../b 
pulling from ../b 
searching for changes 
adding changesets 
adding manifests 
adding file changes 
added 1 changesets with 1 changes to 1 files 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 
~/tmp/shelve/a $ hg unshelve 
unshelving change 'default' 
rebasing shelved changes 
rebasing 2:6696488053d1 "changes to: a as a" (tip) 
merging a 
3 files to edit 
was merge successful (yn)? n 
merging a failed! 
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') 
~/tmp/shelve/a $ hg heads 
changeset: 2:6696488053d1 
tag:   tip 
parent:  0:845abf4a2513 
user:  shelve@localhost 
date:  Thu Jun 16 19:44:05 2016 -0600 
summary:  changes to: a as a 

changeset: 1:e1f75f582f85 
user:  Alex Orange <crazycasta@gmail.com> 
date:  Thu Jun 16 19:44:05 2016 -0600 
summary:  a as aa 

Answer 1

은 다음과 같습니다 여기에이 문제를 야기하는 방법의 예 내 솔루션은. 또한 문제의 조금 더 보여줍니다. 당신이 해결되지 않은 unshelve와 함께 HG 풀을 할 경우 문제가 온다.

~ $ cd tmp 
~/tmp $ cd shelve/a 
~/tmp/shelve/a $ hg resolve a 
merging a 
3 files to edit 
continue: hg unshelve --continue 
~/tmp/shelve/a $ cd ../b 
~/tmp/shelve/b $ echo Cause failure 
Cause failure 
~/tmp/shelve/b $ hg pull ../a 
pulling from ../a 
searching for changes 
adding changesets 
adding manifests 
adding file changes 
added 1 changesets with 1 changes to 1 files (+1 heads) 
(run 'hg heads' to see heads, 'hg merge' to merge) 
~/tmp/shelve/b $ hg heads 
changeset: 2:6696488053d1 
tag:   tip 
parent:  0:845abf4a2513 
user:  shelve@localhost 
date:  Thu Jun 16 19:44:05 2016 -0600 
summary:  changes to: a as a 

changeset: 1:e1f75f582f85 
user:  Alex Orange <crazycasta@gmail.com> 
date:  Thu Jun 16 19:44:05 2016 -0600 
summary:  a as aa 

~/tmp/shelve/b $ cd ../a 
~/tmp/shelve/a $ hg unshelve --continue 
rebasing 2:6696488053d1 "changes to: a as a" (tip) 
unshelve of 'default' complete 
~/tmp/shelve/a $ hg commit -m "a as aaa" 
~/tmp/shelve/a $ cd ../b 
~/tmp/shelve/b $ hg pull 
pulling from /home/crazycasta/tmp/shelve/a 
searching for changes 
adding changesets 
adding manifests 
adding file changes 
added 1 changesets with 1 changes to 1 files 
(run 'hg update' to get a working copy) 
~/tmp/shelve/b $ echo Problem 
Problem 
~/tmp/shelve/b $ hg heads 
changeset: 3:a804c9f51cd6 
tag:   tip 
parent:  1:e1f75f582f85 
user:  Alex Orange <crazycasta@gmail.com> 
date:  Thu Jun 16 20:02:43 2016 -0600 
summary:  a as aaa 

changeset: 2:6696488053d1 
parent:  0:845abf4a2513 
user:  shelve@localhost 
date:  Thu Jun 16 19:44:05 2016 -0600 
summary:  changes to: a as a 

~/tmp/shelve/b $ echo Solution 
Solution 
~/tmp/shelve/b $ hg strip -r 2 
saved backup bundle to /home/crazycasta/tmp/shelve/b/.hg/strip-backup/6696488053d1-313495de-backup.hg 
~/tmp/shelve/b $ hg heads 
changeset: 2:a804c9f51cd6 
tag:   tip 
user:  Alex Orange <crazycasta@gmail.com> 
date:  Thu Jun 16 20:02:43 2016 -0600 
summary:  a as aaa