Mercurial > hg
view tests/test-mq-qdelete.out @ 10135:9a4034b630c4 stable
patch: better handling of sequence of offset patch hunks (issue1941)
The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.
author | Greg Onufer <gonufer@jazzhaiku.com> |
---|---|
date | Wed, 09 Dec 2009 16:56:00 -0800 |
parents | 561ff8d9e4f0 |
children |
line wrap: on
line source
adding base abort: qdelete requires at least one revision or patch name abort: cannot delete applied patch c popping c now at: b a b a b series status popping b now at: a a b series status patch a finalized without changeset message 1 [mq]: a 0 base abort: cannot delete revision 3 above applied patches patch d finalized without changeset message patch e finalized without changeset message f 4 [mq]: f 3 [mq]: e 2 [mq]: d 1 [mq]: a 0 base adding base abort: no revisions specified no patches applied abort: revision 0 is not managed abort: cannot delete revision 2 above applied patches popping c now at: b abort: unknown revision 'c'! applying c patch c is empty now at: c patch a finalized without changeset message patch b finalized without changeset message c 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base patch c finalized without changeset message 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base series status