now if you have 1 file:
//testing change
//with extra row
in 2 subversion clients
both at revision 2
then one changes:
//testing changeMyChange
//with extra row
and commits this then another changes:
//testing changeNoMychange
//with extra row
If you then also want to commit you first have to update
and that should result in a merge conflict
johan
On Mon, Mar 30, 2009 at 17:40, <webpost_at_tigris.org> wrote:
> One file had the text:
> //testing
>
> The other one had:
> //testing change
> //with extra row
>
> Both were committed, and if I compare them I can see that the correct
> content is compared.
> The files are marked as updated both in the console and in eclipse GUI. I
> like subclipse, but cant understand this.
>
> I've tried with subclipse 1.4.7 and 1.4.8
>
> > On Mon, Mar 30, 2009 at 11:23 AM, <webpost_at_tigris.org> wrote:
> > > I can't get any flags for conflicts when merging. I only get updates.
> > >
> > > What could be wrong?
> > >
> > > I change test.php in Trunk and in a Branch, on the same row, with
> different texts. Commit them both and then merges them.
> > >
> > > Shouldn't that give a conflict?
> >
> > It is up to Subversion to decide. Did the merged file have both lines
> > of text? If not, then maybe you did the merge wrong?
> >
> > You might want to install the CollabNet merge client. It is built on
> > Subclipse and make the process easier.
> >
> > http://desktop-eclipse.open.collab.net/
> >
> > --
> > Thanks
> >
> > Mark Phippard
> > http://markphip.blogspot.com/
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1483147
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1483477
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-03-30 18:08:26 CEST