Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard <markphip_at_gmail.com> wrote:

> On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> > Please check the poperties on one of the files. Tell me what the
> mergeinfo: is prior to your merge
> > and after your merge. Up to this point we were talking about
> generalities, but we are getting down to specifics now.
>
> FWIW, after running the merge just run svn diff. It will show the
> changes it made to the properties.
>
>
Hi Mark thanks for responding too.
We are trying to automate this process for many files.
We simply merge and commit until we hit a Conflict.

> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
Received on 2013-04-24 23:07:29 CEST