• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: Site management strategies with Subversion
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Site management strategies with Subversion


  • Subject: Re: Site management strategies with Subversion
  • From: Arturo Perez <email@hidden>
  • Date: Tue, 14 Mar 2006 16:08:28 -0500

email@hidden wrote:
I was just looking at the branching/merging chapter of the red-bean book, and it looks like not even having my own working branch is going to completely save me, because when you go to merge changes it's still based on a revision, not on a per-file basis. So I'm still stuck with having work in progress pulled in along with the work I'm ready to publish, if that work in progress has been committed.

Well, again. if your changes are to one file for one feature then there's no problem. The above is only a problem if you want to merge 1 file from a set of 8 that implemented a change. But I don't see why you'd want to do that.


Let's say you changed files x.java, x.html, and x.js to add the latest nifty pulldown calendar function. You committed them and so they are revision 60. Your production version is in tags/production and is revision 42.

So you go to the place where you keep tags/production and the subdirectory containing x.java and you do (I think)
svn merge -r 60 x.java


Similarly for x.html and x.js. Is there _any_ situation where you'd only want to merge 1 of those three files despite the fact that all three of them are required to implement the feature? I don't see why.

I do understand your concern that if you go to your production copy and you do a svn merge -r 60 you'll get all the changes between 42 and 60. I agree that you don't want that, generally speaking. But does the above do what you want?

I do like (not!) how the subversion documentation totally ignores/downplays how important doing a single file merge is. The only thing I've found after googling for a bit was the one liner at the end of http://svnbook.red-bean.com/en/1.0/re16.html

-arturo
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden


  • Follow-Ups:
    • Re: Site management strategies with Subversion
      • From: email@hidden
References: 
 >Site management strategies with Subversion (From: email@hidden)
 >Re: Site management strategies with Subversion (From: Arturo Perez <email@hidden>)
 >Re: Site management strategies with Subversion (From: email@hidden)
 >Re: Site management strategies with Subversion (From: Arturo Perez <email@hidden>)
 >Re: Site management strategies with Subversion (From: email@hidden)

  • Prev by Date: Re: Generating reports in excel?
  • Next by Date: boolean changing value in a RR loop
  • Previous by thread: Re: Site management strategies with Subversion
  • Next by thread: Re: Site management strategies with Subversion
  • Index(es):
    • Date
    • Thread