Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR #3142 (and related) - fix dropped at the branch merge? #3575

Closed
vicuna opened this issue Apr 1, 2005 · 2 comments
Closed

PR #3142 (and related) - fix dropped at the branch merge? #3575

vicuna opened this issue Apr 1, 2005 · 2 comments
Labels
bug

Comments

@vicuna
Copy link

vicuna commented Apr 1, 2005

Original bug ID: 3575
Reporter: administrator
Status: closed
Resolution: fixed
Priority: normal
Severity: minor
Category: ~DO NOT USE (was: OCaml general)

Bug description

According to http://camlcvs.inria.fr/cgi-bin/cvsweb/ocaml/camlp4/etc/pa_o.ml
the 308 branch changes up to 3.08.3 were supposed to be merged with the
trunk. However changes between 1.58.2.1 and 1.58.2.2 (that fixed
#3015, #3140, #3142) still do not seem to be present on the trunk :-(

--
Aleksey Nogin

Home Page: http://nogin.org/
E-Mail: nogin@cs.caltech.edu (office), aleksey@nogin.org (personal)
Office: Moore 04, tel: (626) 395-2200
@vicuna
Copy link
Author

vicuna commented Apr 11, 2005

Comment author: administrator

According to http://camlcvs.inria.fr/cgi-bin/cvsweb/ocaml/camlp4/etc/pa_o.ml
the 308 branch changes up to 3.08.3 were supposed to be merged with the
trunk. However changes between 1.58.2.1 and 1.58.2.2 (that fixed
#3015, #3140, #3142) still do not seem to be present on the trunk :-(

These are changes that were done in 1.58.2.1, then undone in 1.58.2.2.
Either CVS has problems handling that case when merging a branch,
or I made a mistake during the merge.

Either way, I've fixed it. Thanks for the report.

-- Damien

@vicuna
Copy link
Author

vicuna commented Apr 11, 2005

Comment author: administrator

fixed DD 2005-04-11

@vicuna vicuna closed this as completed Apr 11, 2005
@vicuna vicuna added the bug label Mar 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@vicuna