tests/test-conflict.out
author |
Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|
Wed, 19 Apr 2006 11:41:25 -0700 |
changeset 2096 |
f5ebe964c6be |
parent 1933 |
7544700fd931
|
child 2175 |
b2ae81a7df29 |
permissions |
-rw-r--r-- |
Ignore EPIPE in pipefilter
This hides the following traceback (there's a race condition involved,
so you may have to try a few times to hit it):
$ hg sign --key key-that-does-not-exist
Signing 2062:4bad92f4ea65
gpg: skipped "key-that-does-not-exist": secret key not available
gpg: signing failed: secret key not available
Exception in thread Thread-1:
Traceback (most recent call last):
File "threading.py", line 442, in __bootstrap
self.run()
File "threading.py", line 422, in run
self.__target(*self.__args, **self.__kwargs)
File "mercurial/util.py", line 24, in writer
pin.close()
IOError: [Errno 32] Broken pipe
abort: Error while signing
346
|
1 |
merge: warning: conflicts during merge
|
|
2 |
merging a
|
|
3 |
merging a failed!
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
diff
changeset
|
4 |
e7fe8eb3e180+0d24b7662d3e+ tip
|
346
|
5 |
something else
|
|
6 |
=======
|
|
7 |
something
|
748
|
8 |
M a
|