Mercurial > hg
view tests/test-tags.out @ 2511:041d8f0a8437
mq: hg qnew -f should refresh the new patch
qnew -f was originally meant to just skip the localchanges check.
But, it currently discards the local changes, which is not at all what
people expect.
This patch changes qnew -f to create the new patch and then
run hg qrefresh on it. The local changes will be in the new
patch.
author | Chris Mason <mason@suse.com> |
---|---|
date | Tue, 27 Jun 2006 11:23:06 -0400 |
parents | dbdce3b99988 |
children | fb493241d7f6 |
line wrap: on
line source
unknown 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0acdaf898367 tip 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first tip 1:8a3ca90d111dc784e6575d373105be12570e8776 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4 8a3ca90d111d tip M a 8a3ca90d111d+ tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0acdaf898367+ first 0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first M a 8216907a933d tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 8216907a933d+8a3ca90d111d+ tip M .hgtags tip 6:c6af9d771a81bb9c7f267ec03491224a9f8ba1cd first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4 .hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry .hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed localtags, line 1: tag 'invalid' refers to unknown node 1 files updated, 0 files merged, 0 files removed, 0 files unresolved .hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry .hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed localtags, line 1: tag 'invalid' refers to unknown node tip 8:4ca6f1b1a68c77be687a03aaeb1614671ba59b20 first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4 changeset: 8:4ca6f1b1a68c .hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry .hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed localtags, line 1: tag 'invalid' refers to unknown node tag: tip parent: 3:b2ef3841386b user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: head