automatic merge - quick question

2013-03-19 Thread Z W
Hi All We like to perform frequent automatic svn merges between our trunk and our branches but we don't have much experience with svn merging. We read that Svnmerge.py could help but we weren't sure as we read elsewhere that svn 1.6 does merges similar to Svnmerge.py, and so Svnmerge.py should no

Re: automatic merge - quick question

2013-03-20 Thread Daniel Shahaf
Z W wrote on Tue, Mar 19, 2013 at 22:43:44 -0700: > We are also not sure what that "blocking" feature does or what it means. > It's the ability to make the distinction between "r42 has been merged, do not try to merge it again" and "r42 has not been merged, but do not offer to merge it". > We li

Re: automatic merge - quick question

2013-05-29 Thread Michael Diers
On 2013-03-20 06:43, Z W wrote: [...] > We like to perform frequent automatic svn merges between our trunk and > our branches but we don't have much experience with svn merging. [...] > We like to include this automatic and frequent merging process as part > of our daily Hudson job. [...] You may