OK then. Now that the xdocs in the two branches contains the same files and directories it will be easy to check what patches didn't get into HEAD. I'll get on it and post my findings to JIRA.

Meanwhile could someone please reopen MAVEN-1386?

--
Dennis Lundberg

Brett Porter wrote:
Just a clarification - the site SHOULD be published from HEAD. I accidentally
slipped a not in there.

Quoting Brett Porter <[EMAIL PROTECTED]>:


Either should be fine. If you apply the patch to MAVEN-1_0-BRANCH locally,
then
cvs update -A to get back to HEAD, and commit, it should be applied to HEAD
correctly, except for clashes with the bits already applied.

Stuff on the branch will get merged eventually if it does get committed there
-
but I'd appreciate not having to merge a whole bunch of duplicates if
possible! :)

Thanks,
Brett

Quoting Eric Pugh <[EMAIL PROTECTED]>:


Hi,

I may have made a slight hash of applying MAVEN-1386. The submitter of

the

patch was directed at using MAVEN-1_0-BRANCH.   I saw the patch as an
improvement, not a bug fix, and attempted to apply it to CVS HEAD.

Can you clarify if I should apply his patch file to MAVEN-1_0-BRANCH since
it has quite a few documentation improvements?  Since I was applying to
HEAD, some of his fixes wouldn't go.  He volunteered to cut a new patch
against HEAD if that would help.

Guess I'm just looking for a bit of direction!

Eric


-----Original Message-----
From: Brett Porter [mailto:[EMAIL PROTECTED]
Sent: Friday, July 23, 2004 6:42 AM
To: Maven Developers List
Subject: Maven 1.x CVS and road map


Hi all,

A quick note to say that I have merged the Maven 1.0 code into
CVS HEAD, so that
HEAD is (almost) up to date.

MAVEN-1_0-BRANCH remains for bugfixes and will become 1.0.1 if
necessary. New
development should occur on CVS HEAD for 1.1 and the site should not be
published from there.

Cheers,
Brett


--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]





---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to