Bug: histedit should ignore diff options
Hans Meine
meine at informatik.uni-hamburg.de
Mon Feb 1 09:44:41 CST 2010
On Monday 01 February 2010 16:34:11 Hans Meine wrote:
> To be explicit: with the above configuration and current histedit, I often
>
> have exceptions like this after a simple changeset reordering:
> | File "foo-gui", line 433
> | result = ...
> | ^
> |IndentationError: expected an indented block
Uuuh, I just noticed that it is not as easy to recover from this as I thought
it would be: Although histedit indicated that there were backups of the
stripped changesets:
10 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saving bundle to /informatik/home/meine/BMBF/code/.hg/strip-backup/2f3fbe2622a7-backup
saving bundle to /informatik/home/meine/BMBF/code/.hg/strip-backup/2f3fbe2622a7-temp
adding branch
adding changesets
adding manifests
adding file changes
added 8 changesets with 16 changes to 10 files
they were not valid:
hg unbundle /informatik/home/meine/BMBF/code/.hg/strip-backup/2f3fbe2622a7-backup
adding changesets
transaction abort!
rollback completed
abort: 00changelog.i at a6f79525d4c3: unknown parent!
That's sad, now I need to check manually where the indentation might have
suffered. :-(
Ciao,
Hans
More information about the Mercurial
mailing list