Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / lazarus / 2003-08

Problems with CVS

4 messages · 2 people ·

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Bob Wingard
to Bob Wingard: Please look at the last CVS update you made, it does not look like it patched dialogs.pp…
Bob Wingard wrote 7 lines
Mattias, Please look at the last CVS update you made, it does not look like it patched dialogs.pp correctly. I can not build. When I look at the dialogs.pp file I see things like <<<<<<< 1.33 which look like version numbers but they are not comment lines and the compiler does not like them.

<snip>

Never mind, I deleted the local copy and tried again and it worked this time.

Bob

Reply by email

Marc Weustink
to Bob Wingard: Please look at the last CVS update you made, it does not look like it patched dialogs.pp…
Bob Wingard wrote 10 lines
Bob Wingard wrote: >Mattias, > Please look at the last CVS update you made, it does not look like it > patched dialogs.pp correctly. I can not build. When I look at the > dialogs.pp file I see things like <<<<<<< 1.33 which look like version > numbers but they are not comment lines and the compiler does not like them. <snip> Never mind, I deleted the local copy and tried again and it worked this time.

What you saw was the result of a merge conflict at your side. You should have seen a notice that there was a confilct.

Marc

Show quoted text 6 lines
Bob _________________________________________________________________ To unsubscribe: mail with "unsubscribe" as the Subject archives at http://www.lazarus.freepascal.org/mailarchives

Reply by email

Bob Wingard

Mattias,
Please look at the last CVS update you made, it does not look like it patched dialogs.pp correctly. I can not build. When I look at the dialogs.pp file I see things like <<<<<<< 1.33 which look like version numbers but they are not comment lines and the compiler does not like them.

Bob

Reply by email

Bob Wingard
to Bob Wingard
Marc Weustink wrote 21 lines
At 15:59 1-8-2003 -0400, Bob Wingard wrote: > Bob Wingard wrote: > >> Mattias, >> Please look at the last CVS update you made, it does not look >> like it patched dialogs.pp correctly. I can not build. When I look >> at the dialogs.pp file I see things like <<<<<<< 1.33 which look >> like version numbers but they are not comment lines and the compiler >> does not like them. > > <snip> > > Never mind, I deleted the local copy and tried again and it worked > this time. What you saw was the result of a merge conflict at your side. You should have seen a notice that there was a confilct. Marc

<snip>

I did, but I renamed the local file before the update because I knew that the conflict was comming so I was not expecting the conflict and had a minor brain spasm when the update did not work.

Bob

Reply by email