Re: packages + revision control: is that possible?

On 9/12/07, Nathan Gray wrote:
> On Wed, Sep 12, 2007 at 06:16:19PM +0200, Mojca
Miklavec wrote:
> > I've been googling around, but found no
satisfactory solution so far.
> > I would like to have a repository holding multiple
packages/modules,
> > but as opposed to svn, where each
"module" is a separate folder, I
> > need multiple packages/modules to contain files in
the same folder.
> >
> > So, assume that I have the following files:
> >
> > dir1/file1 (belongs to package 1)
> > dir1/file2 (belongs to package 1)
> > dir1/file3 (belongs to package 2)
> > dir2/file1 (belongs to package 1)
> > dir2/file2 (belongs to package 2)
>
> With darcs, I would set up two repositories (package1
and package2).
> I would then set up a combined repository:
>
>   darcs get package1 combined
>   cd combined
>   darcs pull ../package2
>
> I would then continue to make edits to 'package1' and
'package2', and keep
> 'combined' up-to-date by pulling from both source
repositories.
>
> There has been talk about nested repositories in darcs,
but the
> concept is still very ellusive.

I'm sorry for this complete newbie question. I have now
tried the
following, but the last command fails:

mkdir p1
mkdir p2
mkdir p12

cd p1
darcs init
mkdir dir1
mkdir dir2
touch dir1/file1 dir1/file2 dir2/file1
darcs add -r dir1/
darcs add -r dir2/
darcs record -a -m "p1 added"

cd ../p2
darcs init
mkdir dir1
mkdir dir2
touch dir1/file3 dir2/file2
darcs add -r dir1/
darcs add -r dir2/
darcs record -a -m "p2 added"

cd ../p12
darcs init
darcs pull -a ../p1
darcs pull -a ../p2

I get

We have conflicts in the following files:
./dir1 ./dir1/file1 ./dir1/file2 ./dir2 ./dir2/file1
Finished pulling and applying.

How exactly should I combine the two repositories? I would
be very
grateful for any suggestions or hints ...

Thanks,
     Mojca
_______________________________________________
darcs-users mailing list
darcs-usersdarcs.net

http://lists.osuosl.org/mailman/listinfo/darcs-users

On Mon, Sep 17, 2007 at 04:35:34AM +0200, Mojca Miklavec
wrote:
> On 9/12/07, Nathan Gray wrote:
> > With darcs, I would set up two repositories
(package1 and package2).
> > I would then set up a combined repository:
> >
> >   darcs get package1 combined
> >   cd combined
> >   darcs pull ../package2
> >
> > I would then continue to make edits to 'package1'
and 'package2', and keep
> > 'combined' up-to-date by pulling from both source
repositories.
> >
> > There has been talk about nested repositories in
darcs, but the
> > concept is still very ellusive.
> 
> I'm sorry for this complete newbie question. I have now
tried the
> following, but the last command fails:
> 
> mkdir p1
> mkdir p2
> mkdir p12
> 
> cd p1
> darcs init
> mkdir dir1
> mkdir dir2
> touch dir1/file1 dir1/file2 dir2/file1
> darcs add -r dir1/
> darcs add -r dir2/
> darcs record -a -m "p1 added"
> 
> cd ../p2
> darcs init
> mkdir dir1
> mkdir dir2
> touch dir1/file3 dir2/file2
> darcs add -r dir1/
> darcs add -r dir2/
> darcs record -a -m "p2 added"

The problem appears to be that you are recording everything
for each
repo in a single patch.  There are two conflicts: 'mkdir
dir1' and
'mkdir dir2'.  If you record those separately, you need not
ever
experience a conflict.

Let's introduce a third repository, which contains only the
directory
structure, with no files:

mkdir directory_layout
cd directory_layout
darcs init
mkdir dir1
darcs add dir1
darcs record -a -m 'dir1 added'
mkdir dir2
darcs add dir2
darcs record -a -m 'dir2 added'

cd ..
darcs get directory_layout p1
cd p1
touch dir1/file1 dir1/file2 dir2/file1
darcs add -r dir1/
darcs add -r dir2/
darcs record -a -m "p1 files added"

cd ..
darcs get directory_layout p2
cd p2
touch dir1/file3 dir2/file2
darcs add -r dir1/
darcs add -r dir2/
darcs record -a -m "p2 files added"

You should now be able to pull into your combined repository
without
any conflicts.

> cd ../p12
> darcs init
> darcs pull -a ../p1
> darcs pull -a ../p2

-kolibrie


_______________________________________________
darcs-users mailing list
darcs-usersdarcs.net

http://lists.osuosl.org/mailman/listinfo/darcs-users