an unfortunate approach to developing patches - hg qpop is unhappy

timeless timeless at gmail.com
Thu Apr 30 09:34:11 CDT 2009


What follows is effectively a transcript of what I did w/ a real
repository recently. It's unfortunate, and perhaps something could
have protected me.

While this testcase involves 3 repos all local to eachother, in the
real system, 0 is upstream, 1 is my push station, and 2 is my
workstation.

timeless-mbp:mq timeless$ mkdir 0; cd 0; hg init; echo hi > hi; hg add
hi; hg commit -m hi; echo x >> x; hg add x; hg commit -m x; hg clone .
../1; hg clone . ../2; cd ../2; hg up -r 0; echo b >> b; hg add b; hg
qnew -f b ; cd ../1; hg up -r 0; cd ../2; hg export tip | hg -R ../1
import -; cd ../1; hg merge -r 1; hg commit -m merging; hg push; cd
../2; hg pull; hg qpop; hg id
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
applying patch from stdin
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
pushing to /private/tmp/mq/0
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
pulling from /private/tmp/mq/0
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (-1 heads)
(run 'hg update' to get a working copy)
abort: popping would remove a revision not managed by this patch queue
299fbf815fa1 qtip/b/qbase


More information about the Mercurial-devel mailing list