[pLog-svn] How do I merge my code with plog latest code easily.

[Jon Daley]

 	I think you just have to use svn switch, I don't think you can get 
better than that.

On Tue, 12 Jul 2005, nick nizhenyuan wrote:
> Currenly, just as you said,  I hosted SVN locally. I am still trying
> to find ways to link remote SVN and local SVN together, so I could
> merge remote latest code to my local SNV code:)
>
> On 7/12/05, Jon Daley <plogworld at jon.limedaley.com> wrote:
>>        I was reading the svn manual tonight, and I thought of another
>> potential way to keep track of local changes - I don't know how well it
>> would work, but thought I would write it for others to think about as
>> well.  What if you stored your local modifications as a subversion branch,
>> hosted locally?  I'll bet subversion could do a good job of merging
>> things if you did that.
>>
>>  On Mon, 11 Jul 2005, Jon Daley wrote:
>>> Done:
>>> http://wiki.plogworld.net/index.php/Merging_with_Subversion
>>>
>>> On Mon, 11 Jul 2005, Oscar Renalias wrote:
>>>> somebody put this in the wiki... this probably is the question of the
>>>> month!! (I've already seen it a few times in the forums)

**************************************************************
*         Jon Daley         *      Proofreading is more      *
*                           *  effective after publication.  *
* http://jon.limedaley.com/ *                      -- Barker *
**************************************************************