Mercurial > hg
view tests/test-hgignore.out @ 2424:092039246d73
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.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 10 Jun 2006 17:39:29 +0200 |
parents | 0d36e3d7e2ea |
children | 4e521a3ee5eb |
line wrap: on
line source
-- A dir/b.o ? a.c ? a.o ? dir/c.o ? syntax -- abort: .hgignore: invalid pattern (relre): *.o -- A dir/b.o ? .hgignore ? a.c ? syntax -- .hgignore: ignoring invalid syntax 'invalid' A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o -- A dir/b.o -- A b.o