tests/test-addremove.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 10 Jun 2006 17:39:29 +0200
changeset 2424 092039246d73
parent 2182 4e35843b2683
child 2955 9d1c3529ebbc
permissions -rw-r--r--
Report on push/pull if heads are merged, too, like for new heads. Use case: If a remote repo has two heads and I _want_ to merge them, I merge and push. Meanwhile someone else pushed on top of one of the heads. He won't get a warning, because he doesn't create a new head, I won't notice that I don't close a head, because I don't get a message telling me.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2182
4e35843b2683 Corrected test output for deprecated addremove command.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1623
diff changeset
     1
(the addremove command is deprecated; use add and remove --after instead)
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     2
adding dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     3
adding foo
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     4
dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     5
foo
2182
4e35843b2683 Corrected test output for deprecated addremove command.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1623
diff changeset
     6
(the addremove command is deprecated; use add and remove --after instead)
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     7
adding dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     8
adding foo_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
     9
dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
    10
foo_2