RE: Strange behaviour with confilcting binary files
From: Glenn McAllister <gmcallister_at_sapient.com>
Date: 2004-09-01 17:45:47 CEST
That's the expected behaviour actually. Automatically merging a binary
Glenn McAllister
277 Wellington Street West
-----Original Message-----
G'day All,
I'm seeing unexpected behaviour when a conflict occurs with binary files
with svn 1.1.0 rc2 (running at home on Win2k)
From looking at the documentation if a conflict occurs when updating 3
file - working copy contatining the conflict flags
It seems that svn does not create "file.mine" when encountering binary
Is this by design? There isn't any mention of it in the docs, i've tried
search on "conflict" and "binary".
The reason it has com to my attention is that i was writing a little app
that handles conflict / merging of word documents using words compare
I've managed to duplicate this behaviour using both the svn command line
client and tortisesvn.
Any feedback appreciated.
---------------------------------------------------------------------
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.