tests/test-encode.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 10 Jun 2006 17:39:29 +0200
changeset 2424 092039246d73
parent 2175 b2ae81a7df29
child 6093 f5b00b6e426a
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.

%% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% uncompress our new working dir copy
this is a test