tests/test-patch.out
author Sune Foldager <cryo@cyanite.org>
Wed, 14 Apr 2010 19:11:35 +0200
branchstable
changeset 10908 816bac2f9452
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4645
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     1
adding a
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     2
% check custom patch options are honored
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     3
requesting all changes
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     4
adding changesets
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     5
adding manifests
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     6
adding file changes
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     7
added 1 changesets with 1 changes to 1 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 8995
diff changeset
     8
updating to branch default
4645
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     9
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    10
applying ../a.diff
0de7e6e27fe4 Add tests for ui.patch regression.
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    11
Using custom patch