BODY { font-family:Arial, Helvetica, sans-serif;font-size:12px;
}(Apologies for the delayed reply on this.)
I agree with your comment regarding files that were modified in the
merge - you must be careful not to overwrite changes made in the
merge when replacing entire files. However since it its your working
copy and hence your work, you should be aware that there are some
apparent 'changes' need reverting in a diff tool.
My feeling is it would be useful but I can see the dangers to those
less informed.
Hopefully the forthcoming patch file work will make this scenario
easier to deal with.
Thanks,
Jonny.
On Tue 27/07/10 10:11 PM , Daniel Becroft djcbecroft_at_gmail.com sent:
On Wed, Jul 28, 2010 at 2:30 AM, Jonny Rylands wrote:
Just wondering if it would be possible to implement the following:
Export any uncommitted changes from a local copy - added, modified &
unversioned files - preserving the directory structure of the files
exported.
The use case I have is the following:
Changes are made to a local copy of a repository branch when it
becomes apparent that a merge is required from trunk to provide
functionality needed for the local changes. Want to commit the merge
without including the local changes. To do this I need take a copy of
the local changes before reverting the local repository and performing
the merge. It would be useful to export the locally modified files
using the method described above rather than exporting the entire
repository which can take a long time; or using patch files as there
are often issues reapplying patch files when the repository has
changed.
Please let me know what you think of this.
What happens if one of the files that you've modiifed is modified
during the merge? You can't simply replace the copy in the working
copy with your exported version. You'll need the specific changes
you've made (ie patch files). I think the current implementation is
being improved in 1.7 to allow for tree structure details as well
(but I could be wrong).
Personally, I simply have two WCs for every branch I work on - one
for development, the other for merging.
Cheers,Daniel B.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2640148
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-29 16:29:41 CEST