Zikula Community

• craigh
  
  

  • Rank: Developer
  • Registered: Jun 16, 2003
  • Last visit: May 29, 2010
  • Posts: 1966

  Posted: Oct 21, 2009 - 01:53 PM

  I'm pretty dumb about this, so be gentle.
  
  is it possible to commit changes in a file to a trunk and a branch? how do I do that?

  • 
  •  
• drak
  
  

  • Rank: Software Foundation
  • Registered: Jul 21, 2001
  • Last visit: May 31, 2010
  • Posts: 624

  Posted: Oct 21, 2009 - 03:10 PM

  Of the same repository? Assuming
  
  /home/drak/core is a checkout of https://code.zikula.org/svn/core/ then I can make my changes and commit from the /home/drak/core, that will commit all changes down the tree. Is this what you mean? I don't recommend making separate checkouts for branches and so on, checkout the entire tree and work from that.
  
  Drak
  
  --
  Zikula Lead Developer
  Board Member of the Zikula Foundation
  Follow me on twitter.com/zikuladrak

  • 
  •  
• nestormateo
  
  

  • Rank: Team Member
  • Registered: Sep 06, 2006
  • Last visit: May 09, 2010
  • Posts: 2446

  Posted: Oct 21, 2009 - 03:55 PM

  Have to do a commit for the trunk, then merge with branch, or if they are the same code (weird case), change trunk, copy+paste the changed files in the respective branch, and commit the whole tree
  
  Why do you want to do that?
  
  --
  - Mateo T. -
  Mis principios... son mis fines

  • 
  •  
• craigh
  
  

  • Rank: Developer
  • Registered: Jun 16, 2003
  • Last visit: May 29, 2010
  • Posts: 1966

  Posted: Oct 21, 2009 - 11:06 PM

  Quote

  Why do you want to do that?

  
  I have a just released version that is branched in SVN for bug fixes. I want to apply bug fixes to the branch and to the trunk so that both contain the fixes.

  • 
  •  
• craigh
  
  

  • Rank: Developer
  • Registered: Jun 16, 2003
  • Last visit: May 29, 2010
  • Posts: 1966

  Posted: Oct 22, 2009 - 08:53 AM

  drak/mateo, thanks for trying to help. I'm still confused.
  
  Is it not common to have a bugfix branch and a trunk for development? If so, how does one make sure bugfixes applied in a branch also get applied to the trunk?
  
  I'm sure this is an issue in the core. how do you correct issues in /zikula-1 and /main at the same time?

  • 
  •  
• nestormateo
  
  

  • Rank: Team Member
  • Registered: Sep 06, 2006
  • Last visit: May 09, 2010
  • Posts: 2446

  Posted: Oct 22, 2009 - 12:41 PM

  THat's the headache:
  Made the changes on both set of files...
  
  anyways, you can Google for a SVN merge tutorial, commit your trunk then merge into the branch SVN merge is the tool that i use to sync the ported themes to the BlankTheme trunk
  
  --
  - Mateo T. -
  Mis principios... son mis fines

  • 
  •  
• craigh
  
  

  • Rank: Developer
  • Registered: Jun 16, 2003
  • Last visit: May 29, 2010
  • Posts: 1966

  Posted: Oct 22, 2009 - 02:05 PM

  I'm beginning to see. thanks for the help.

  • 
  •  
• craigh
  
  

  • Rank: Developer
  • Registered: Jun 16, 2003
  • Last visit: May 29, 2010
  • Posts: 1966

  Posted: Oct 24, 2009 - 06:18 AM

  turns out I was looking for the merge tool. thanks mateo.

  • 
  •  
• nestormateo
  
  

  • Rank: Team Member
  • Registered: Sep 06, 2006
  • Last visit: May 09, 2010
  • Posts: 2446

  Posted: Oct 24, 2009 - 11:29 AM

  You're welcome Craig
  
  --
  - Mateo T. -
  Mis principios... son mis fines

  • 
  •  
•  
•  

Users on-line

• eledril

This list is based on users active over the last 60 minutes.