[issue2220] rebase leading to -> wdir has unknown parent
Nicolas Dumazet
bugs at mercurial.selenic.com
Fri May 28 06:30:55 UTC 2010
New submission from Nicolas Dumazet <nicdumz at gmail.com>:
This happens on 1.4.1, and on crew.
Get a repo to reproduce that issue:
$ hg clone https://python-twitter.googlecode.com/hg/ python-twitter
$ cd python-twitter
$ hg strip c40b8; hg strip e2a196; hg strip 9c607; hg strip c3538; hg strip
901ca
$ hg up 110
[OK]
# relevant nodes:
$ hg glog -l4
o changeset: 111:ea4e8dcae50d
| branch: dclinton
| tag: tip
| parent: 109:01c47eabd9b6
| summary: [proper change]
|
| @ changeset: 110:c2e6a248e926
| | parent: 108:ab7033cb2650
| | summary: [proper change]
| |
o | changeset: 109:01c47eabd9b6
| | branch: dclinton
| | parent: 107:63d18975b5c3
| | summary: Copied /trunk/ to /branches/dclinton/.
| |
| o changeset: 108:ab7033cb2650
|/ summary: [indentation fix]
$ hg --config "extensions.rebase=" rebase --keep -b dclinton -d 110
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging twitter.py
warning: conflicts during merge.
merging twitter.py failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
$ hg --config "extensions.rebase=" rebase -a
saving bundle to .hg/strip-backup/c2e6a248e926-temp
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 42 changes to 42 files
rebase aborted
$ hg up
abort: working directory has unknown parent 'c2e6a248e926'!
('pfiuu, I'm glad I could isolate that one)
----------
messages: 12708
nosy: nicdumz
priority: bug
status: unread
title: rebase leading to -> wdir has unknown parent
topic: rebase
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2220>
____________________________________________________
More information about the Mercurial-devel
mailing list