Mercurial > hg
annotate tests/test-bookmarks-current.out @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | cb516e788238 |
children | 717c35d55fb3 |
rev | line source |
---|---|
7551
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
1 % no bookmarks |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
2 no bookmarks set |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
3 % set bookmark X |
7816
f420eafe59cd
bookmarks: Set current bookmark if we create a new one on the tip
David Soria Parra <dsp@php.net>
parents:
7551
diff
changeset
|
4 % list bookmarks |
f420eafe59cd
bookmarks: Set current bookmark if we create a new one on the tip
David Soria Parra <dsp@php.net>
parents:
7551
diff
changeset
|
5 * X -1:000000000000 |
7551
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
6 % update to bookmark X |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
8 % list bookmarks |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
9 * X -1:000000000000 |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
10 % rename |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
11 % list bookmarks |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
12 * Z -1:000000000000 |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
13 % new bookmark Y |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
14 % list bookmarks |
7816
f420eafe59cd
bookmarks: Set current bookmark if we create a new one on the tip
David Soria Parra <dsp@php.net>
parents:
7551
diff
changeset
|
15 * Y -1:000000000000 |
f420eafe59cd
bookmarks: Set current bookmark if we create a new one on the tip
David Soria Parra <dsp@php.net>
parents:
7551
diff
changeset
|
16 Z -1:000000000000 |
7551
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
17 % commit |
cab1cf26ca58
bookmarks: tests for track.current option
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
18 % list bookmarks |
7816
f420eafe59cd
bookmarks: Set current bookmark if we create a new one on the tip
David Soria Parra <dsp@php.net>
parents:
7551
diff
changeset
|
19 * Y 0:719295282060 |
f420eafe59cd
bookmarks: Set current bookmark if we create a new one on the tip
David Soria Parra <dsp@php.net>
parents:
7551
diff
changeset
|
20 Z -1:000000000000 |
7817
cb516e788238
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
Alex Unden <alu@zpuppet.org>
parents:
7816
diff
changeset
|
21 % delete bookmarks |
cb516e788238
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
Alex Unden <alu@zpuppet.org>
parents:
7816
diff
changeset
|
22 % list bookmarks |
cb516e788238
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
Alex Unden <alu@zpuppet.org>
parents:
7816
diff
changeset
|
23 no bookmarks set |
cb516e788238
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
Alex Unden <alu@zpuppet.org>
parents:
7816
diff
changeset
|
24 % update to tip |
cb516e788238
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
Alex Unden <alu@zpuppet.org>
parents:
7816
diff
changeset
|
25 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |