[bugzilla-daemon@xxxxxxxxxxxxx]

Comment # 8 on bug 9703 from Stefan Metzmacher

(In reply to comment #7)
> (In reply to comment #5)
> > (In reply to comment #4)
> > > (In reply to comment #2)
> > > > And also push your fix in new Gerrit ? http://code.wireshark.org/review.
> > > > 
> > > > There is a new workflow for Wireshark dev :
> > > > http://wiki.wireshark.org/Development/Workflow
> > > 
> > > So the git repository at http://code.wireshark.org/git/wireshark
> > > is now the main repository? Or is svn still the main repo?
> > 
> > On which branch should I rebase my changes?
> > https://code.wireshark.org/git/wireshark refs/heads/master
> > or
> > https://code.wireshark.org/review/wireshark refs/heads/master
> 
> Both (it is synchronized) 
> 
> Patches merged in revision a5b2a9c93cae2e56c2c5ba0ae32fba11b821175f &
> cac3024d700b3246a3541ba80a08f93dab0b981a &
> 6167a0f6ed0780e8167f0be1d874e3a748e41e45

https://code.wireshark.org/git/wireshark doesn#t have it yet.

Is it indented that every single commit in
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=shortlog
have its extra merge commit?

http://wiki.wireshark.org/Development/Workflow indicates they would be cherry
picked...

---

      You are receiving this mail because:

• You are watching all bug changes.