Question about features

[Daniel Carrera]

John Arbash Meinel wrote:
>> You know what? I think you are right and I goofed. I was thinking: "what
>> if feature A and feature B both edit the same file?".
>>
>> But thinking about it a little more, it doesn't matter. On the second
>> rsync command, all the changes in feature A are effectively deleted and
>> replaced by those in feature B. Is that right? So there's no conflict.
>> The test page simply switches from one branch to another.
>>
>> Thanks! It looks like I was making this whole thing a lot harder than it
>> needed to be. Thanks for the help.
> 
> Well, if you use "rsync --delete", *just* avz will only create new
> files, it won't delete ones that are removed.

Thanks. So "rsync --delete -avz" to send stuff to the test server and 
now there are no conflicts in the server.

You know what? Even if I continue with Darcs, I think I'll switch to the 
rsync method. It really seems to work better. With this issue gone, I'm 
confident that Bazaar and Darcs would work about equally well for me. 
That's what I was hoping to find out when I joined the list.

A big thanks to everyone.

Cheers,
Daniel.