On Tue, Jun 17, 2008 at 9:36 PM, Shaddy Baddah
<[EMAIL PROTECTED]> wrote:
> My understanding is that for a merge, you absolutely need a working copy
> because you need to queue up the different SVN operations involved in the
> merge. If you didn't, then you would have to make non-atomic commits of the
> property changes separate from checking in the actual file changes.

But none of those changes happen in the branch_dir -- they all happen
in the current ("trunk") directory.

Right?  I know I'm still missing something.

Your new patch looks better, but:
  Why cast cmd to a string?
  Do all versions of 'svn info' produce the 'Node Kind' key?  Can you
check has_key first?

Dustin

-- 
Storage Software Engineer
http://www.zmanda.com
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge

Reply via email to