Patch Help

3 views
Skip to first unread message

Shawn Wildermuth

unread,
Jul 19, 2008, 7:34:44 PM7/19/08
to NHibernate Contrib - Development Group
I am new to the "Post a patch" style of development and I am trying to
get my head around the best way to handle this. If I create a patch,
how do I apply that patch so that a next patch I create already has
the other changes in it?

Tuna Toksöz

unread,
Jul 20, 2008, 2:12:27 AM7/20/08
to nhc...@googlegroups.com
You can do it, probably. You'll post patch and somebody from the developer list reviews it and then applies. If you changed something before the committer applies, resend your patch, it will be ok.
--
Tuna Toksöz

Typos included to enhance the reader's attention ...

Tuna Toksöz

unread,
Jul 20, 2008, 2:15:52 AM7/20/08
to nhc...@googlegroups.com
You _cant_, I wanted to say.

josh robb

unread,
Jul 20, 2008, 3:16:37 AM7/20/08
to nhc...@googlegroups.com

This is a problem in general with Centralised SCM systems and OSS
(when your not a committer). There are three general scenarios:

1. Your changes are improvements to the existing patch. In this case
the best/simplest thing is to create a new patch containing all of
your changes.

2. Your changes are logically independent of the previous patch but
touch the same files. Using SVN - there is no good solution for this
situation.

3. Your changes are independent logically and physically. In this case
it's simply a matter of not including unrelated changes in patch files
when you create them. SVN 1.5 has a cool changelist feature which
helps with this.

I've previously use SVK (a distributed svm layer on top of SVN) to
manage changes like#2 - this allows me to checkin changes to a local
repository. These days cool kids might use git-svn - but either of
these tools has a learning curve etc and none of them completely solve
the problem of interrelated but independent changes.

Another alternative that I've sometimes resorted to is having multiple
working copies of a project. e.g.

c:\dev\nhcontrib-linq-IUpdateable
c:\dev\nhcontrib-linq-Expansion

HTH,

j.

Shawn Wildermuth

unread,
Jul 20, 2008, 3:34:54 AM7/20/08
to NHibernate Contrib - Development Group
Good information. the two patches are related (one requires the
other) so the two projects wasn't possible) but luckily the patches
didn't change the same files so I could logically create the patches
and hopefully it'll just go away. Thanks again for the info.

Tx, SW

On Jul 20, 3:16 am, "josh robb" <josh.r...@gmail.com> wrote:
> On Sun, Jul 20, 2008 at 9:34 AM, Shawn Wildermuth
>
Reply all
Reply to author
Forward
0 new messages