Mercurial > hg

annotate tests/test-merge-force.out @ 9079:70c707310d7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile: wrap hg.pot strings at 82 chars By default, xgettext will wrap strings at 79 characters. This width includes the two double-quotes and the '\n' added. Our strings are now wrapped at 78 characters and a line can therefore be up to 82 characters wide in the .po file. Setting the width to 82 characters ensures that xgettext does no silly wrapping on our already-wrapped strings while still wrapping long one-liners at 82 characters.
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 23:54:42 +0200
parents 3682a19bb637
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6256
diff changeset
1 created new head
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 % local deleted a file, remote removed
8545
3682a19bb637 merge: give hint as to how to discover uncommitted changes
Steve Borho <steve@borho.org>
parents: 6336
diff changeset
3 abort: outstanding uncommitted changes (use 'hg status' to list changes)
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4 resolving manifests
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
5 removing a
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
7 (branch merge, don't forget to commit)
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
8 % should show a as removed
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
9 R a
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
10 % manifest. should not have a:
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
11 b