Mailing-List: contact users-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: users@jackrabbit.apache.org
Received-SPF: pass (nike.apache.org: domain of robin.batra@gmail.com
 designates 209.85.222.182 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        b=pjjvvbEWUMmWYOAZZmEXjV2lNmxXou4UQqv7yR5fvcj6m6tbX3GimZcCt13iVOmRjV
         Sp7blQq4nsjd75IREaHGprdfgzmXVlSMXS6esIPc2XRjzXPkZK9tASiAhasdcZlR2jzA
         ez4F+NkZMlfwBQAj1yC4YFJAyoplBkUwO9HHY=
MIME-Version: 1.0
In-Reply-To: <ffd6aaa90910271404t62e2d10fo357d5ba3da2cf0b1@mail.gmail.com>
References: <36ecc5b10910200445s2eede07djc57da7e439e63435@mail.gmail.com>
	 <ffd6aaa90910221306u7e875f2cm30325bed63c0597b@mail.gmail.com>
	 <36ecc5b10910230249y5e2bd995y72ae85e6ee486e7a@mail.gmail.com>
	 <ffd6aaa90910231306r1911edbbp739078dea327cbb1@mail.gmail.com>
	 <36ecc5b10910262236xbe60ce6mf9d3886eef4c80db@mail.gmail.com>
	 <510143ac0910270144y68a0e6b6lf3ca893f88e61b52@mail.gmail.com>
	 <36ecc5b10910270318m61ee0236gb6f3f95c70114fda@mail.gmail.com>
	 <ffd6aaa90910271404t62e2d10fo357d5ba3da2cf0b1@mail.gmail.com>
Date: Fri, 30 Oct 2009 10:11:08 +0530
Message-ID: <36ecc5b10910292141j1b404e4eo33d86aa70136cd0a@mail.gmail.com>
Subject: Re: Branching
From: Robin Batra <robin.batra@gmail.com>
To: users@jackrabbit.apache.org
Content-Type: multipart/alternative; boundary=0016e64d93c0fa7a3f04771fa292

--0016e64d93c0fa7a3f04771fa292
Content-Type: text/plain; charset=ISO-8859-1

Hi Guys

Are  there any pointers for implementing Merge operation in Jackrabbit as
provided by CVS. Because what i have noticed is that the CVS merges the
changes in the user's local workspace and after that the user has to
manually commit the changes where as Node.merge() commits the changes
directly in the Repository thus creating the next version.
Am i right about this? any help would be appreciated.
Thanks in advance.

On Wed, Oct 28, 2009 at 2:34 AM, Tobias Bocanegra <tripod@day.com> wrote:

> hi,
>
> On Tue, Oct 27, 2009 at 11:18 AM, Robin Batra <robin.batra@gmail.com>
> wrote:
> > Thanks a lot guys, finally i got the branching code working. now i am
> able
> > to saparate the working of files in different branches. Thanks a lot once
> > again.
> congratulations.
>
> > One more thing if i want to merge the nodes in different branch, do i
> > have to create my own compare view or does jcr provide anything for
> that??
> unfortunately not. you have to do it yourself.
>
> regards, toby
>
> >
> > On Tue, Oct 27, 2009 at 2:14 PM, Jukka Zitting <jukka.zitting@gmail.com
> >wrote:
> >
> >> Hi,
> >>
> >> On Tue, Oct 27, 2009 at 6:36 AM, Robin Batra <robin.batra@gmail.com>
> >> wrote:
> >> > [...]
> >> > N.checkout();
> >> > N.checkin();
> >> > N-> V1.3
> >> > now i clone P1 to W2 (workspace 2)
> >> >
> >> > N' (node under cloned P1' )
> >> > N'.checkout()
> >> > N'.checkin()
> >> >
> >> > it still gave me 1.4 and not 1.3.1
> >>
> >> That's expected, since the base version (1.3) against which you are
> >> making the checkin does not yet have any other successors. You'll only
> >> end up with a branch when you checkin against a base version that
> >> already has one or more successors.
> >>
> >> For example, if you now did a N.checkin() without first updating it to
> >> the latest 1.4 version, you'd end up with 1.3.1.
> >>
> >> BR,
> >>
> >> Jukka Zitting
> >>
> >
> >
> >
> > --
> > Regards
> >
> > Robin Batra
> >
>


-- 
Regards

Robin Batra

--0016e64d93c0fa7a3f04771fa292--