首页 \ 问答 \ SVN分支到Trunk合并问题(SVN Branch To Trunk Merge Issue)

SVN分支到Trunk合并问题(SVN Branch To Trunk Merge Issue)

我试过谷歌搜索手头的问题，但无济于事。 我的团队处于一个有趣的境地。
我们的发布分支需要合并回我们的主干。 提交约4周后，没有人这样做（我们通常每周尝试一次）。 然后，开发人员将分支合并到主干，但只进行了一系列不包含分支的所有修订的修订。
示例：我们在提交1000处创建了分支。提交1000-1400全部在第一次合并之前发生。 开发人员合并提交1300-1400。 一直以来，也有提交到行李箱的承诺。
又过了一两个星期，现在我们要承诺1500.我们去做另一次合并，当然，这一切都爆发了; 我们没有大量的提交需要通过（提交1000-1300）。 我们无法完全恢复，因为我们有可能破坏整个时间段内对主干所做的所有更改。
我们有什么选择？ 这是一个关键的合并，因为我们的主要版本即将推出; 我们需要在相对较短的时间内尽可能减少弄乱某些事情的机会。

I have tried Googling the issue at hand, to no avail. My team is in an interesting situation.
Our release branch needed to be merged back into our trunk. After about 4 weeks of commits, no one had done so (we usually try to do it once a week). A developer then merged the branch to the trunk, but only did a range of revisions that did NOT include all of the revisions to the branch.
Example: we created the branch at commit 1000. Commits 1000-1400 all happened before the first merge. The developer merged commits 1300-1400. All the while, there have been commits to trunk as well.
Another week or two passed, and now we're up to commit 1500. We go to do another merge and of course, it all blows up; we don't have a ton of commits needed for the builds to pass (commits 1000-1300). We can't exactly revert, because we risk ruining all of the changes made to trunk during this whole time.
What are our options? This is a critical merge as our major release is soon; we need to reduce the chance for messing something up as much as possible in a relatively small amount of time.

原文：https://stackoverflow.com/questions/28206243

更新时间：2022-04-17 06:04

最满意答案

 它看起来像变量l1和l2只在initialize方法中退出。 尝试这个：  
public void allblack() {
    l1.setForeground(Color.black);
    l2.setForeground(Color.black);
}

private JLabel l1,l2;
public void initialize() {

    frmDasLeiterspiel = new JFrame();
    frmDasLeiterspiel.setResizable(false);
    frmDasLeiterspiel.setTitle("Das Leiterspiel");
    frmDasLeiterspiel.setBounds(100, 100, 420, 420);
    frmDasLeiterspiel.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
    frmDasLeiterspiel.getContentPane().setLayout(null);

    l1 = new JLabel("1");
    l1.setBackground(Color.LIGHT_GRAY);
    l1.setBounds(340, 190, 50, 50);
    l1.setHorizontalAlignment(SwingConstants.CENTER);
    frmDasLeiterspiel.getContentPane().add(l1, BorderLayout.CENTER);

    l2 = new JLabel("2");
    l2.setBackground(Color.LIGHT_GRAY);
    l2.setHorizontalAlignment(SwingConstants.CENTER);
    l2.setBounds(278, 190, 50, 50);
    frmDasLeiterspiel.getContentPane().add(l2);
    [....]
    JButton btnNewButton = new JButton("Roll the dice!");
    btnNewButton.addMouseListener(new MouseAdapter() {
        @Override
        public void mouseClicked(MouseEvent arg0) {
            allblack();
        }
    });
    btnNewButton.setBounds(12, 294, 378, 25);
    frmDasLeiterspiel.getContentPane().add(btnNewButton);
    [...]
    }

it looks like the variables l1 and l2 only exitst in the initialize method. try this: 
public void allblack() {
    l1.setForeground(Color.black);
    l2.setForeground(Color.black);
}

private JLabel l1,l2;
public void initialize() {

    frmDasLeiterspiel = new JFrame();
    frmDasLeiterspiel.setResizable(false);
    frmDasLeiterspiel.setTitle("Das Leiterspiel");
    frmDasLeiterspiel.setBounds(100, 100, 420, 420);
    frmDasLeiterspiel.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
    frmDasLeiterspiel.getContentPane().setLayout(null);

    l1 = new JLabel("1");
    l1.setBackground(Color.LIGHT_GRAY);
    l1.setBounds(340, 190, 50, 50);
    l1.setHorizontalAlignment(SwingConstants.CENTER);
    frmDasLeiterspiel.getContentPane().add(l1, BorderLayout.CENTER);

    l2 = new JLabel("2");
    l2.setBackground(Color.LIGHT_GRAY);
    l2.setHorizontalAlignment(SwingConstants.CENTER);
    l2.setBounds(278, 190, 50, 50);
    frmDasLeiterspiel.getContentPane().add(l2);
    [....]
    JButton btnNewButton = new JButton("Roll the dice!");
    btnNewButton.addMouseListener(new MouseAdapter() {
        @Override
        public void mouseClicked(MouseEvent arg0) {
            allblack();
        }
    });
    btnNewButton.setBounds(12, 294, 378, 25);
    frmDasLeiterspiel.getContentPane().add(btnNewButton);
    [...]
    }

SVN分支到Trunk合并问题(SVN Branch To Trunk Merge Issue)

最满意答案

相关问答

JLabel中的SetLocation(SetLocation in JLabel)[2021-11-26]

Java - 在extern函数中更改JLabel Frontcolor(Java - Changing JLabel Frontcolor in extern function)[2023-04-26]

JLabel正在消失(JLabel is disappearing)[2024-01-03]

用Java移动JLabel(Moving JLabel in Java)[2023-12-20]

Java帮助：JLabel(Java help: JLabel's)[2022-11-30]

JLabel没有出现(JLabel doesnt appear)[2021-09-30]

JLabel，GridLayout(JLabel, GridLayout)[2023-11-06]

JLabel改变了它自己(JLabel changing on it's own)[2022-03-27]

Java - 使用存储在数组中的文本更改JLabel(Java - Changing A JLabel With Texts Stored in An Array)[2022-02-26]

JLabel和Image？(JLabel with Image?)[2022-02-20]

相关文章

最新问答