##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Make contrib/buildrpm work on Fedora 9....
Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r7277:3e000e2b default
Show More
test-manifest-merging.out
15 lines | 521 B | text/plain | TextLexer
/ tests / test-manifest-merging.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
Revert changeset c67920d78248....
 r3325 % init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Giorgos Keramidas
Revert changeset c67920d78248....
 r3325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved