Sorry, I have now found the problem at last:
In single pane view the 'Save' button does not get enabled i.e. trivial fix
Oly
On 10/10/05, Oliver Dungey <oliver.dungey@gmail.com> wrote:
>
> 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
> files.
> 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.
>
> Regards,
> Oly
>
Received on Mon Oct 10 12:48:04 2005