geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jeremy Whitlock" <jcscoob...@gmail.com>
Subject Re: Web site update
Date Wed, 21 Jun 2006 18:24:57 GMT
Hernan,
    Can you paste the command that you are trying to use?  Merging is the
proper approach for this type of thing.  With the merge command, you can
create a patch using the unified-diff output and piping it to a file.  If I
can see your command, I can hook you up.

Take care,

Jeremy

On 6/20/06, Hernan Cunico <hcunico@gmail.com> wrote:
>
> Merging isn't working, I don't see anything being updated into trunk.
> How do I create a patch if my local working copy is fully in sync with the
> branch, not the trunk.
>
> Is there a way to copy/move the content of the branch and overwrite the
> trunk?
>
> Thanks
>
> Hernan
>
> David Blevins wrote:
> > On Jun 19, 2006, at 12:11 PM, Hernan Cunico wrote:
> >
> >> Hi All,
> >> I'm a bit lost with the two branches we have now to manage the web
> >> site.  I have the .../site/branches/may2006 branch updated and  ready
> >> to go live, it already includes that last two changes  (updated events
> >> and added book to documentation).
> >>
> >> What would be the next step? replacing the content of .../site/ trunk
> >> and then commit to the live site from the updated trunk? how  do I
> >> replace it the content in .../site/trunk with the may2006 branch?
> >
> >
> > Typically, you'd merge over your changes.  Could use the 'svn merge'
> > command.  Or you could create a patch file and apply it to trunk.  I
> > like to use the graphical diff tool in Visual SlickEdit, but that's  not
> > free.
> >
> > -David
> >
> >
>

Mime
View raw message