tests/test-empty-dir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 10 Jun 2006 17:39:29 +0200
changeset 2424 092039246d73
parent 2175 b2ae81a7df29
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:
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     1
321
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
     2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1926
ba198d17eea9 changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents: 925
diff changeset
     3
sub/b not present
ba198d17eea9 changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents: 925
diff changeset
     4
sub not present