[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Patch: Doesn't appy changes/Usability issues

From: Oliver Dungey <oliver.dungey_at_gmail.com>
Date: 2005-10-10 12:37:43 CEST

I have been using patch for about a month or so now and I am having
continued troubles. Here is the sort of scenario:

1. a developer submits me a patch
2. I apply the patch (using 'Apply All') and I see that it contains 5 file
updates that are simple merges and 2 that are complex merges requiring
manual selection of changes and resolution.
3. I go through the complex merges and resolve the conflicts and save the
4. I look at the simple merges and they all look perfect.
5. I exit Tortoise merge and go to perfom the commit.
6. I see 2 files to commit (the complex merges) and nothing else i.e. the
other 5 file updates have not been applied.

I have been round this process many, many times and either end up with no
changes to commit or all the source files vanishing. I have carefully
inspected the contents of the patches and it all looks perfect.

I am assuming that there is a bug here but am having trouble identifiying
what is going on - I have noticed that on the simple merges the 'Save'
button never becomes enabled, is this the problem?

I think that more positive confirmations of actions within the patch/merge
tool would help me define what the issue is, but at the moment I am unclear
why the changes I see on screen are not saved as there is no explicit 'Save
patched files' - it just appears that it shows me the changes but doesn't
actually do anything about them.

Received on Mon Oct 10 12:41:13 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.