Hello again Stefan and Jared,
Thanks for explaining that Stefan, if I understand correctly it is
like this: Because subversion doesn't store the whole files -only the
changes- there is nothing to start Word in merge mode with.
QUESTION: Is that right?
The method you described before:
> You have to use (1) "resolve later" for those files during a merge or chose
> mine or theirs.
> If you chose "resolve later", then after the merge has finished you can
> then (2) use the edit-conflicts function (which then uses the merge script).
seems to work fine. I do have a problem here though. Let me try to
explain:
1) I start a merge via the Tortoise menu on >one< .docx file in two
seperate branches
2) The merge menu shows me that there are conflicts between the file
in the two branches so I select the "resolve all later" option
3) A number of .rxx files are created
4) I then select the "edit conflicts" function from the Tortoise menu
>on the local file<
5) Word 2007 opens the three window merge mode with the local file, a
file containing differences (presumably from the .rxx files) and in
the main window a new file that contains the suggested merge with
"track changes on"
6) I accept all changes in the new document and overwrite the local
file
7) I commit the file to the branch
This all seems to work fine but the .rxx files from step 3) remain,
and I have not been able to verify that all those files were
represented in step 5.
QUESTION: Can you confirm that I only have to run the procedure once
and can then remove all .rxx files?
Jared, what do you mean by "problems due to Track Changes
involvement"? The script seems to work when I use it from the "edit
conflicts" menu as described above. I do think it should be possible
to create a script that runs the steps 1-5 or even 1-6 automatically.
It would be even better if you could run it from the (extended)
tortoise menu. It would make working with .doc* files a lot easier.
What do you think?
Once again a big thank you for your time!
Erik
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-22 16:41:46 CET