[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 67c3a6853b0e76d4a3fd6570573197407ebb
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 67c3a6853b0e76d4a3fd6570573197407ebbf6fb |
Date: |
Mon, 27 Feb 2006 06:07:55 +0100 |
-----------------------------------------------------------------
Revision: 67c3a6853b0e76d4a3fd6570573197407ebbf6fb
Ancestor: 7c3416fbc0d88126928ede8fb1d92a8e2dfa0c89
Author: Timothy Brownawell <address@hidden>
Date: 2006-02-27T01:35:01
Branch: net.venge.monotone
Modified files:
ChangeLog commands.cc merge.cc merge.hh monotone.texi
testsuite.at
ChangeLog:
2006-02-26 Timothy Brownawell <address@hidden>
Add a new command, merge_into_dir, to allow a project to include an
unrelated project as a subdir. Also add a show_conflicts command that
performs a dry-run merge and prints conflict counts.
* commands.cc: new commands, merge_into_dir and show_conflicts
* commands.cc (propagate): remove duplicated code; this now calls
merge_into_dir with a dir of '' (the empty string).
* monotone.texi: Document the new commands.
* tests/t_{merge_into_dir,show_conflicts}.at: Test the new commands.
* testsuite.at: Use the new tests.
* merge.{cc,hh}: Factor a store_roster_merge_result function out
of interactive_merge_and_store.
monotone --db={your.database} diff
--revision=7c3416fbc0d88126928ede8fb1d92a8e2dfa0c89
--revision=67c3a6853b0e76d4a3fd6570573197407ebbf6fb
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 67c3a6853b0e76d4a3fd6570573197407ebbf6fb,
monotone <=