Merging question

Clark

unread,

May 14, 2008, 10:42:13 AM5/14/08

to myupb-de...@googlegroups.com

Howdy,

I updated the trunk with revs 300 and 301 which were fixes for the quote system.

Then I decided to try doing a merge (gulp!!!) on the tracker branch.

I followed the instructions using the settings shown in tracker_merge.jpg (attached).

When I did diff, I got the list in diff.jpg (also attached).

I saw that it wanted to delete tracker-install.php which it did when I did a dry run (useful function that). I would have expected it to keep this file.

Any ideas Tim???

Clark

tracker_merge.jpg

diff.jpg

Tim Hoeppner

unread,

May 15, 2008, 9:32:40 AM5/15/08

to MyUPB Developers Forum

I will take a look tonight and see if i can find out whats going on.

> tracker_merge.jpg
> 88KViewDownload
>
> diff.jpg
> 72KViewDownload

Tim Hoeppner

unread,

May 15, 2008, 9:43:17 AM5/15/08

to MyUPB Developers Forum

Alright I found the problem, its your revisions, you should have
merged revision 286 - 302, you have to go ALL the way back to the last
merge (include the revision of the last merge). I did the merge so the
tracker branch is up to date with the trunk as of right now.

On May 14, 9:42 am, "Clark" <cl...@myupb.com> wrote:

> tracker_merge.jpg
> 88KViewDownload
>
> diff.jpg
> 72KViewDownload

Clark

unread,

May 15, 2008, 12:15:23 PM5/15/08

to myupb-de...@googlegroups.com

So is it always the last merge???

Clark

Tim Hoeppner

unread,

May 15, 2008, 12:29:25 PM5/15/08

to MyUPB Developers Forum

Well you want to grab all the changes since the last merge right?
Thats why it was trying to delete the install file, rebles had added
that in between the last merge and the revisions you were trying to
merge. So when you tried to merge it said "we don't need this
anymore".

> > 72KViewDownload- Hide quoted text -
>
> - Show quoted text -

Reply all

Reply to author

Forward