> -----Original Message----- > From: Matt Sicker <[email protected]> > Sent: Thursday, April 21, 2022 1:31 PM > To: Apache Logging Developers List <[email protected]> > Subject: Re: does the master branch compile? > > You've only got two copies of the git checkout? If I knew of better > ways of keeping works in progress stored in Git other than `git > stash`, I wouldn't have so many local copies myself.
git worktrees. git clone --bare https://upstream/repo.git project.git cd project.git git worktree add ../project-master master git worktree add ../project-branch-42 branch-42 > > On Thu, Apr 21, 2022 at 10:15 AM Gary Gregory <[email protected]> wrote: > > > > I keep two repositories, one for master, one for release-2.x, because of > > this kind of sillinesss. > > > > Gary > > > > On Thu, Apr 21, 2022, 08:04 Remko Popma <[email protected]> wrote: > > > > > Thank you Piotr! > > > > > > Understood now. > > > Too bad that switching branches from 2.x to master leaves the invalid > > > source code under log4j-api/src/test (and mvn clean also doesn’t remove > > > it). > > > I’ll just have to remember that I guess. > > > :-) > > > > > > Thanks again for the quick reply. > > > > > > > On Apr 21, 2022, at 20:52, Piotr P. Karwasz <[email protected]> > > > wrote: > > > > > > > > Hello Remko, > > > > > > > >> On Thu, 21 Apr 2022 at 13:14, Remko Popma <[email protected]> > > > wrote: > > > >> > > > >> Warnings look like this: > > > >> [WARNING] > > > >> > > > >> > > > C:\Users\remko\IdeaProjects\logging-log4j2\log4j- > api\src\test\java\org\apache\logging\log4j\LogManagerTest.java:[52,5] > > > >> [exports] class Test in module is not exported > > > >> > > > > > > > > In `master` there is a separate `log4j-api-test` project and > > > > `log4j-api/src/test` should be empty. That is why cherry-picking from > > > > `release-2.x` to `master` often gives conflicts on tests. > > > > > > > > Piotr > > > -- Jason Pyeron | Architect PD Inc | Certified SBA 8(a) 10 w 24th St | Certified SBA HUBZone Baltimore, MD | CAGE Code: 1WVR6 .mil: [email protected] .com: [email protected] tel : 202-741-9397
