Code

Opened 8 years ago

Closed 8 years ago

Last modified 7 years ago

#1411 closed defect (invalid)

Changeset [2428] merged to both [2426] and [2427]

Reported by: Tom Tobin <korpios@…> Owned by: jacob
Component: *.djangoproject.com Version:
Severity: trivial Keywords:
Cc: Triage Stage: Unreviewed
Has patch: no Needs documentation: no
Needs tests: no Patch needs improvement: no
Easy pickings: UI/UX:

Description

Changeset [2428] states it was a merge to [2427], but [2426] was included as well. (Should be a minor svn:log tweak.)

Attachments (0)

Change History (4)

comment:1 Changed 8 years ago by adrian

  • Resolution set to invalid
  • Status changed from new to closed

[2426] is implied because it comes before [2427].

comment:2 Changed 8 years ago by Tom Tobin <korpios@…>

Hmm, okay, but I'm left asking/wondering: what if [2426] happened to be something you didn't merge, for whatever reason, into magic-removal? By what you're saying, we'd assume that everything in trunk between the last merge-to and the present one was included in the present case, even if that's not the case.

(I'm sorry if I sound confused; it's only because I am.) :)

comment:3 Changed 8 years ago by adrian

Just FYI, each merge to magic-removal from trunk includes every changeset up until a certain point. I believe this is the way the Subversion docs suggest doing merges, so it's how we decided to do things. So, in the example you give, that just wouldn't happen -- we wouldn't merge [2427] without [2426]. Everything's always sequential. Hope that makes sense.

comment:4 Changed 7 years ago by korpios

  • Reporter changed from Tom Tobin <korpios@…> to Tom Tobin <korpios@…>

Add Comment

Modify Ticket

Change Properties
<Author field>
Action
as closed
as The resolution will be set. Next status will be 'closed'
The resolution will be deleted. Next status will be 'new'
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.